Merge "[automerger skipped] Set min_sdk_version to be part of mainline modules am: b6b048f0f3 am: c6cea656ee am: b015df41c1 -s ours" into rvc-qpr-dev-plus-aosp