Merge "[automerger skipped] Set min_sdk_version to be part of mainline modules am: 1d42a459b2 am: e59897af49 -s ours am: 7aba9c37e1 -s ours" into rvc-qpr-dev-plus-aosp