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

* commit '7604b23cec35c40185397bbaa09b488562dfe5d0':
  Update for MediaSessionCompat support