Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI" into rvc-qpr-dev am: 32cb36ec45

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bf3ebc643f425b4f9efe5312d78922d50954d40