tree d45a0921d681d177311b16d72fc5c63196f29688
parent b8500f00c8826fa033988386cc89ada5c573400d
parent c954c01f5565cc50f404ac377698fe2a2019f477
author Robin Lee <rgl@google.com> 1611598795 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611598795 +0000

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