[automerger skipped] Merge "Merge "CEC: Make HDMI CEC volume control configurable" into rvc-dev am: 77576fe9 am: 9d66fadc" into rvc-d1-dev-plus-aosp am: 0abd2809 -s ours

am skip reason: Change-Id I83ae9b423122b540b9adb156fb1c6f5964dd6105 with SHA-1 da665a67 is in history

Change-Id: I956be73e6476aceaf77ae9e465377cbcc18c7d93