Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService" am: 4efb0c51 am: a40f432a am: 0e7175db am: 54a545f1 Change-Id: I84fac437a1adf97053e4bbfb7d45178b0487332f