am a65a4f64: am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev

* commit 'a65a4f64e6206c370bce79d74753f6f67bc4b4e0':
  Be more paranoid about threading in MediaSessionRecord