am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev

* commit '23df1c46b768bb2a1363b6f671b0d0c4879538b7':
  Allow null queues to be set in MediaSession