am 9bf62048: am d7e30037: Merge "Update for MediaSessionCompat support" into lmp-mr1-dev

* commit '9bf620484bcd12fa9a4da605d5263840eeec0758':
  Update for MediaSessionCompat support