Merge changes from topic "am-3c649823115f425fa6393e697437e108" into...

Merge changes from topic "am-3c649823115f425fa6393e697437e108" into tm-d1-dev-plus-aosp am: 1e40a3ed -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: Id96b5c5fc16d44f0af9be258b1f4ee1e9f6c4717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>