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

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

Change-Id: I529bf1d8c1d47a5006d2b6820f9aeaff04861204