Merge "Ensure MediaSessionCompat.Callback behavior matches framework" into lmp-mr1-ub-dev