[automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 am: 09e4d59b70 am: a15eefdd38 -s ours

am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 b22347cb33 is in history

Change-Id: Ie78942643078b125bcde43c85b3559872a798624