[automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 -s ours am: 1e384a12b1 -s ours
am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 f65f67c622 is in history
Change-Id: I7fa52e641425586763495eae138fef4c872d1f62
This commit is contained in: