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

Change-Id: Ide0a92508e38ea8b1100d3263fe9ae8bf9b25e48