[automerger skipped] Merge "CEC: Make HDMI CEC volume control configurable" into rvc-dev am: 77576fe964 am: 9d66fadca8 am: 4efdf23411 am: 5ac049f6ee -s ours
am skip reason: Change-Id I83ae9b423122b540b9adb156fb1c6f5964dd6105 with SHA-1 da665a67f1 is in history
Change-Id: I47c5151b0ad1be920d38558615795037ec8821b8
This commit is contained in: