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

am skip reason: Change-Id I20d66fa7d5669412444d5e15eb23c9bfa6f35500 with SHA-1 856e8ebc15 is in history

Change-Id: Idf20cb15c0bfedb3f713c24d68a3c0b83a2a49ce