am 58afc5c4: am 235b2e66: Merge "CEC: return non-null MHL controller when not ready" into lmp-dev

* commit '58afc5c4ce6d1538028b26a32d97187cc83414ff':
  CEC: return non-null MHL controller when not ready