Merge changes from topic "atv-rro" am: c954c01f55

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0d00e18620061fd3e0ad66316513f43d631791d