Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev am: f82228a753

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadd818bb9c25841ab7b36f3ba3273bab23246e6f