[automerger skipped] Set min_sdk_version to be part of mainline modules am: 1d42a459b2 am: e59897af49 -s ours am: 7aba9c37e1 -s ours

am skip reason: Change-Id I90e135617642c87ecff517a17120285d8355827e with SHA-1 6732ec8048 is in history

Change-Id: Icdfcff717bda56d45ccfac692448d52810ee703b