[automerger skipped] Set min_sdk_version to be part of mainline modules am: 1d42a459b2 -s ours am: 29a48f63b5 -s ours

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

Change-Id: I2ce6a83792636f54e55c5bff7755aa90fef95146