Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2 am: 15c9c1f8d1

am: 80713e98f7

Change-Id: Idbc93cea10adc0077341015ecd479baa76ae2c76

media/java/android/media/MediaPlayer.java

@@ -2336,10 +2336,7 @@ public class MediaPlayer extends PlayerBase
     }
 
     private void scanInternalSubtitleTracks() {
-        if (mSubtitleController == null) {
-            Log.d(TAG, "setSubtitleAnchor in MediaPlayer");
-            setSubtitleAnchor();
-        }
+        setSubtitleAnchor();
 
         populateInbandTracks();