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

am skip reason: skipped by user rgl

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70d39fb20d9c25a6dae0cb8473af5ce68713d818