Merge "Fix crash."

Author: Dianne Hackborn

services/java/com/android/server/am/ActivityManagerService.java

@@ -4934,7 +4934,7 @@ void grantUriPermissionUncheckedFromIntentLocked(NeededUriGrants needed,
     void grantUriPermissionFromIntentLocked(int callingUid,
             String targetPkg, Intent intent, UriPermissionOwner owner) {
         NeededUriGrants needed = checkGrantUriPermissionFromIntentLocked(callingUid, targetPkg,
-                intent, intent.getFlags(), null);
+                intent, intent != null ? intent.getFlags() : 0, null);
         if (needed == null) {
             return;
         }