am bfb30244: Merge "[ActivityManager] Fix NPE when start activity"

* commit 'bfb30244fbd3c6ba9eb8308b6bbacc9f78e8b6ef':
  [ActivityManager] Fix NPE when start activity