[automerger skipped] Merge changes from topic "atv-rro" am: c954c01f55 am: ea4a548faa -s ours

am skip reason: skipped by user rgl

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia276b711911664f6ce83fb75e8b203dc0ea4623b