Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService" am: 4efb0c510d
am: a40f432ac6

Change-Id: Ia4c92888f5ddc2e01a8b9025bdec0b00afb8c539