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

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