[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays...

[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI" into rvc-qpr-dev am: 32cb36ec am: a798d995 -s ours am: 66fb73c0 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7aa0f8962eb3fbb744cadb42f1b955c9f0c77695