Merge changes from topic "am-bd8380ff117a4a3396ab39955df80cbc" into...

Merge changes from topic "am-bd8380ff117a4a3396ab39955df80cbc" into tm-d1-dev-plus-aosp am: 93fcca82 -s ours

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

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

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



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