Merge "Finish stubbing out MediaSessionCompat" into lmp-mr1-dev