am 1d8b27bc: am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev

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