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

[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: 8d7fa344 -s ours am: 8e7b8a2b -s ours

am skip reason: Merged-In Ic7e102201196285cba18e12e27c7cd4d40dcc8e4 with SHA-1 95f91979 is already in history

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



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