Merge "MediaSession2: Move MediaController2.PlaybackInfo to updatable"