Merge changes from topic "am-40cd7bd7ac7e4db8912b15db866c73d5" into...

Merge changes from topic "am-40cd7bd7ac7e4db8912b15db866c73d5" into tm-qpr-dev-plus-aosp am: ab55259b -s ours

am skip reason: Merged-In I91170ba399b3a596320b3bd9c8188912e5c4f1be with SHA-1 c3c9ada6 is already in history. Merged-In was found from reverted change.

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

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



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