[automerger skipped] Merge changes from topic "revert-1510032-atv-rro-ZVBUWAKVPO" am: 3d6736d0fd am: 8966a5dd89 am: 1437a142dc -s ours am: b1c0040462
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559778 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ief8bd041c18c6b63f651cba2b8c9bb69b4d9c4d3
This commit is contained in: