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

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

Change-Id: Id39c2494b766e2634078c5f6217d5bd8cf7b506c