Merge "MediaSession2: Apply apilint"