Merge "Clean up MHL local devices when HdmiControlService turns into disabled state" into lmp-dev