[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 707578b8 -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: I0e9ee0c62110d36569dde6cdf657a5398c60eec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>