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

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