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

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