Merge "[automerger skipped] Set min_sdk_version to be part of mainline modules am: 071bc6096d am: 83dd5c7b2c am: 198fa3bbf9 -s ours" into rvc-qpr-dev-plus-aosp