Merge "RESTRICT AUTOMERGE Allow CDM to hide overlays" into rvc-qpr-dev am: 40ef3c251c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02d5142bd27cd61c9abbde1f449717e9098ffa75