Merge "Set SAM To Disabled On HdmiControl Disabled" am: 1bc876bb5b am: 9e89d13906 am: 00ce169055 am: f465d5a2bd
am: 7970f36605

Change-Id: I4cfbb9a98b23ceddc327696b441288e631624f45