[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 -s ours am: 5ba75303 -s ours am: 57211d9b -s ours am: b44f228e -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: I8c1cc905d2bf3f1608ec704a5ce58729e3c7978a