[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: 69cd53b1 -s ours am: da561b8a -s ours

am skip reason: Merged-In Idae7ad9580f3c98e5f253e9e0627f68f5f87967b with SHA-1 a93f0026 is already in history

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



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