am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev

* commit '5a7068eec454df33575176d9f4ee58de577a6401':
  SysUI: Correctly compare MediaControllers