am 49b227af: am 12feec33: Merge "Clean up MHL local devices when HdmiControlService turns into disabled state" into lmp-dev

* commit '49b227af955741e9cfb5bc0bafdbd38be7ea60e7':
  Clean up MHL local devices when HdmiControlService turns into disabled state