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