Merge changes from topic "revert-1510032-atv-rro-ZVBUWAKVPO"

* changes:
  Revert "Remove device/google/atv overlay from RRO exclusion"
  Revert "Make device/google/atv compatible with RRO"