[automerger skipped] Merge "CEC: Make HDMI CEC volume control configurable"...

[automerger skipped] Merge "CEC: Make HDMI CEC volume control configurable" into rvc-dev am: 77576fe9 am: 9d66fadc am: 4efdf234 am: 5ac049f6 -s ours am: 5dbb3527 -s ours

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

Change-Id: Ia249e16db636d32d14ff48575280526d9cb35bc3