[automerger skipped] Set min_sdk_version to be part of mainline modules am: 50938ff95b am: f40d9efd7a -s ours am: 12e72d2fb1 -s ours

am skip reason: Change-Id I3415af31f0d67e2e4c1fc5b7fdd188d6686ad535 with SHA-1 8e992d772f is in history

Change-Id: Id84ba441eb09947749594ec424b7e3bcf8285b21