Merge commit '55744530222288c79a5e1aa61b65f7f6b2262fab' * commit '55744530222288c79a5e1aa61b65f7f6b2262fab': frameworks/base: Handle null from topRunningNonDelayedActivityLocked
Merge commit '55744530222288c79a5e1aa61b65f7f6b2262fab' * commit '55744530222288c79a5e1aa61b65f7f6b2262fab': frameworks/base: Handle null from topRunningNonDelayedActivityLocked