Merge "Set SAM To Disabled On HdmiControl Disabled" am: 1bc876bb5b
am: 9e89d13906

Change-Id: I20534d988badea0727c66c7e2b7e94fef5b1ab88