am 74a66013: am f71f5e89: Merge "[ActivityManager] fix NPE in...
am 74a66013: am f71f5e89: Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked."
* commit '74a66013':
[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.