Merge changes Ifb05b969,I74808d8e

* changes:
  [CEC Configuration] Switch HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED to Shared Preferences
  [CEC Configuration] Switch HDMI_CEC_ENABLED to Shared Preferences