[automerger skipped] Merge "Set min_sdk_version" am: 8fe47dd0 am: b8426673 -s ours

am skip reason: Merged-In Ie6dc1f59b459ec01605d796a4d81be04bc1d07da with SHA-1 79254645 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2138336



Change-Id: Id67a002ce02dd693947f47fe7d9ff46fd54fac88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>