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

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