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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad1b80837eb58531e5edd3bd8f7196a0cb9dd236