[automerger skipped] Merge changes from topic "cdm_overlay-rvc-dev" into...

[automerger skipped] Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev am: f82228a7 am: 8a94c6d8 -s ours am: ff3bdc83 -s ours

am skip reason: Change-Id I78673b7b95f4c3cb31fab180201eb17c9123bddf with SHA-1 f717d719 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If92fc69300f793e7220175ae1377be004af72180