[automerger skipped] Merge "RESTRICT AUTOMERGE Allow CDM to hide overlays"...

[automerger skipped] Merge "RESTRICT AUTOMERGE Allow CDM to hide overlays" into rvc-qpr-dev am: 40ef3c25 am: cc962fce -s ours am: 3cdbafae -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I009703f69434a257b8f97cdc21518b7aef287173