tree 5ee8b3638cb7afb0bb5769bd08ec7280b681edc0
parent f4a729180c5eae0bb5ebb7f746ff2687cfd2e4ee
parent 6a5777dd5020378507b97511925a0369f8f408b4
author TreeHugger Robot <treehugger-gerrit@google.com> 1612314431 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1612314431 +0000

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev

* changes:
  RESTRICT AUTOMERGE Allow CDM to hide overlays
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI