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

Change-Id: I3f7c5ec073e82dd323e655bc886a6958a6db0f61