Merge "[automerger skipped] Merge "Set min_sdk_version to be part of mainline...

Merge "[automerger skipped] Merge "Set min_sdk_version to be part of mainline modules" into rvc-dev am: eeb32b36 am: 8433bb76 am: 2cd9faf2 -s ours" into rvc-qpr-dev-plus-aosp am: 2b22b5fc -s ours

am skip reason: Change-Id Idc4aa437c21ea1add95a709bf709a5dbe662b084 with SHA-1 9b1bf05e is in history

Change-Id: I2d7b0c6ee023b4db62b4088c28ce1eaa397e5e6b