am 00cbb751: am 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev

* commit '00cbb751533bf683480ba80f0c450c59c6ca96a1':
  Allow null queues to be set in MediaSession