Merge "[automerger skipped] Set min_sdk_version to be part of mainline modules am: bd57ee1e35 am: f1878d9d6e am: 5f52d78c0c -s ours" into rvc-qpr-dev-plus-aosp