[automerger skipped] Merge "Merge "CEC: Add listener for HDMI CEC volume...

[automerger skipped] Merge "Merge "CEC: Add listener for HDMI CEC volume control feature" into rvc-dev am: 75ef06da am: 1ce1702e" into rvc-d1-dev-plus-aosp am: 0b01d20a -s ours

am skip reason: Change-Id I342d748114bae99b3c3f236502d73bfeac9e9ac5 with SHA-1 7ddbb62c is in history

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

Change-Id: I44eacc37da27f5d4d5cd1d8c723bf5b90f1b7fa0