[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: 92da8381 -s ours am: 772edd90 -s ours

am skip reason: Merged-In I9a53541e98c0ba596b288ae92fe75f3279aac9cb with SHA-1 237e77a4 is already in history

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



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