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

* commit 'd7e30037aa719f43d74bb1f706f2df480168e7d0':
  Update for MediaSessionCompat support