[automerger skipped] Merge "Set min_sdk_version" am: 37ebee73 am: eef23b0f...

[automerger skipped] Merge "Set min_sdk_version" am: 37ebee73 am: eef23b0f -s ours am: 5e2bf354 -s ours

am skip reason: Merged-In I994c20b87ccdcd9b653bd38e0c7e147ba8ebcc06 with SHA-1 015c4047 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2138337



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