Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"