Merge "MediaSession2: Pull out MediaSession2CallbackStub"