Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"

Author: Jean-Baptiste Queru

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

@@ -3410,7 +3410,7 @@ private final int startActivityUncheckedLocked(HistoryRecord r,
                     // being started, which means not bringing it to the front
                     // if the caller is not itself in the front.
                     HistoryRecord curTop = topRunningNonDelayedActivityLocked(notTop);
-                    if (curTop.task != taskTop.task) {
+                    if (curTop != null && curTop.task != taskTop.task) {
                         r.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
                         boolean callerAtFront = sourceRecord == null
                                 || curTop.task == sourceRecord.task;