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

am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 f65f67c622 is in history

Change-Id: I3f11bd8ff984bca6872ec703e0f71dfcab3ef796