Merge "MediaSession2: Make PlaybackInfoProvider inner interface"