Merge "Ensure that framework does not refer MediaSession2 related code"