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 am: 8c8b351222 -s ours

am skip reason: Change-Id I3415af31f0d67e2e4c1fc5b7fdd188d6686ad535 with SHA-1 50938ff95b is in history

Change-Id: Ibf2c8cfb9708b93c59aab59db500d883813e45f3