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

* changes:
  Revert "Move device/google/atv overlays into SystemUI"
  Revert "Move keyguard enabled to Component Override"