Merge changes from topic "am-78846876a9074356b4ffd487d7925656" into...

Merge changes from topic "am-78846876a9074356b4ffd487d7925656" into tm-qpr-dev-plus-aosp am: 4ba5ab35 -s ours

am skip reason: Merged-In I2d525d59c24df63429ef090e41e45952506c1c59 with SHA-1 718fd088 is already in history

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



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