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

* commit 'c647e050aa609f12b646258b2383fceca52c2db0':
  SysUI: Correctly compare MediaControllers