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

Change-Id: I84fac437a1adf97053e4bbfb7d45178b0487332f