[automerger skipped] Prevent non-system overlays from showing over CDM UI am:...

[automerger skipped] Prevent non-system overlays from showing over CDM UI am: d7f514ab am: c51c89f2 -s ours am: 24ad3207 -s ours

am skip reason: Change-Id I004843edf5a156dc07fb961edf80272f5cb50163 with SHA-1 d7f514ab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13121152

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8776285ee0e4666e8c994f2171295c14d0e33f94