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

am skip reason: Change-Id I87ce41ad18a7a39f2c6c41c5aec2d8338db3ec8d with SHA-1 dfe14f12b7 is in history

Change-Id: I369b55918f546cc73cd5d6bc47913f89922d81f4