[automerger skipped] Set min_sdk_version to be part of mainline modules am: 071bc6096d am: 83dd5c7b2c -s ours am: 6d9385ec31 -s ours

am skip reason: Change-Id If4a0beed9150f6bed96699e6a78f2a12f25cb78a with SHA-1 1c8ab972b3 is in history

Change-Id: I85ee5fcea806b63f760e7c4e942db85dccda207f