[automerger skipped] Merge "Set min_sdk_version to be part of mainline modules" am: 7888400011 am: 3621ece445 -s ours am: 7472936da2 -s ours am: 080ebf187e -s ours am: 65d722f6f7 -s ours

am skip reason: Change-Id Id89bcc591effc436a7c4a22f4320331d187d2ee7 with SHA-1 f11c3bb0f1 is in history

Original change: undetermined

Change-Id: I7527afe2abab3b20e69817a7a51bad9d248848ba