[automerger skipped] Merge "Set min_sdk_version" am: 8fe47dd0b8 am: b8426673b2 -s ours am: 4627462580 -s ours am: 0a132bc610 -s ours am: 1c85659299 -s ours
am skip reason: Merged-In Ie6dc1f59b459ec01605d796a4d81be04bc1d07da with SHA-1 792546455e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2138336
Change-Id: I31357a21e0722d0d28be935279332d4ec08abe49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: