Merge changes from topic "revert-1510032-atv-rro-ZVBUWAKVPO" am: 58240b2849 am: 6c9c846da6

Original change: https://android-review.googlesource.com/c/device/google/atv/+/1559775

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03884991d2c27a470d11ce5bcb9c2ca55401764d