Fix overzealous ContentProtection filtering.

Failing to parse a UUID from a ContentProtection should only
result in filtering if there was actually a cenc:pssh element
there for us to get it from.

Issue: #1256
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=117220417

library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java

@@ -317,16 +317,18 @@ public class MediaPresentationDescriptionParser extends DefaultHandler
     String schemeIdUri = xpp.getAttributeValue(null, "schemeIdUri");
     String schemeIdUri = xpp.getAttributeValue(null, "schemeIdUri");
     UUID uuid = null;
     UUID uuid = null;
     SchemeInitData data = null;
     SchemeInitData data = null;
+    boolean seenPsshElement = false;
     do {
     do {
       xpp.next();
       xpp.next();
       // The cenc:pssh element is defined in 23001-7:2015.
       // The cenc:pssh element is defined in 23001-7:2015.
       if (ParserUtil.isStartTag(xpp, "cenc:pssh") && xpp.next() == XmlPullParser.TEXT) {
       if (ParserUtil.isStartTag(xpp, "cenc:pssh") && xpp.next() == XmlPullParser.TEXT) {
+        seenPsshElement = true;
         data = new SchemeInitData(MimeTypes.VIDEO_MP4,
         data = new SchemeInitData(MimeTypes.VIDEO_MP4,
             Base64.decode(xpp.getText(), Base64.DEFAULT));
             Base64.decode(xpp.getText(), Base64.DEFAULT));
         uuid = PsshAtomUtil.parseUuid(data.data);
         uuid = PsshAtomUtil.parseUuid(data.data);
       }
       }
     } while (!ParserUtil.isEndTag(xpp, "ContentProtection"));
     } while (!ParserUtil.isEndTag(xpp, "ContentProtection"));
-    if (uuid == null) {
+    if (seenPsshElement && uuid == null) {
       Log.w(TAG, "Skipped unsupported ContentProtection element");
       Log.w(TAG, "Skipped unsupported ContentProtection element");
       return null;
       return null;
     }
     }