Merge "Make MediaSession2.CommandGroup updatable"