[automerger skipped] Merge changes from topic...

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1e2ab93a046c5b55471dcc3f1f602afed98c14c