Merge "[automerger skipped] Set min_sdk_version to be part of mainline modules am: 50938ff95b -s ours am: f2ac868abd -s ours" into rvc-d1-dev-plus-aosp