Merge "MediaSession2: Hide system apis"