[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 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: Idcbce1248d5d9287951efc8b920978c5f260a691