Merge changes I3fc1e667,I1647577a

* changes:
  Revert "Move dream metadata parsing to framework."
  Revert "Read "showClockAndComplications" metadata."