Merge "MediaSession2: Use VolumeProvider2 instead of VolumeProvider"