am 2b34a06f: Merge "Fix MediaSessionManagerTest." into lmp-dev

* commit '2b34a06f0ee6f0acdbf9b91a66909e2d9d1401b4':
  Fix MediaSessionManagerTest.