[automerger skipped] Set min_sdk_version to be part of mainline modules am: bd57ee1e35 -s ours am: e15a5e2ee9 -s ours

am skip reason: Change-Id Ic0c899237ff961660caab3d9111f11ef16aba272 with SHA-1 bd57ee1e35 is in history

Change-Id: I6b7066491cc3abcb986dc8c1688ac6cc482a1b34