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

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

Change-Id: Ia6a6c13f07059276e444c43c510a95a574f7604e