am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev

* commit 'e9905bd489cd6fcb75203b97a3a7d60b95329a6a':
  Make setting the session token in MediaBrowserService synchronous