[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937"...

[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: 0b576743 -s ours am: f249504f -s ours

am skip reason: Merged-In I781d851d875d496c8b57e3512f3f89c9911e9f3c with SHA-1 b0221d1a is already in history

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



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