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

am skip reason: Change-Id I04b4eea7fb03d8207be76d3a5a8fd1a97f52ba9e with SHA-1 92af4e2818 is in history

Change-Id: Ibedbfd5484968c573fbe3aa5e9da94aa8571e6a1