[automerger skipped] Set min_sdk_version to be part of mainline modules am: 3c3f271211 am: 85efb03d15 -s ours

am skip reason: Change-Id I6e251b193a1ee4dc868b17a67b0d730ecd678d8b with SHA-1 3671db5c13 is in history

Change-Id: Ieb55416a4b9be89518fc26d66ad96c9e5b43b0e0