Revert "Make device/google/atv compatible with RRO" am: fa07d83c2c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I111e88554f672ab5fc189a8eee89e66b6d585c88