[automerger skipped] Merge changes from topic "revert-1510032-atv-rro-ZVBUWAKVPO" am: 3d6736d0 am: 8966a5dd am: 1437a142 -s ours am: b1c00404 am: d7e857fc -s ours

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

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

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

Change-Id: I37c14611d48e2323088ec17f733e89696edd4845