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

Change-Id: I57172873b2ac3c24d535af5006657cdab4b7bf79