Merge "Update for MediaSessionCompat support" into lmp-mr1-dev