[automerger skipped] Set min_sdk_version to be part of mainline modules am: edabab205c -s ours am: 4aff610208 -s ours am: bb6cdd2c0c -s ours

am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 153d61e685 is in history

Change-Id: I5ee3d73ffa9c7ccb3136161427456432588d564d