Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am: 7810aed854
am: d89b76a58d

* commit 'd89b76a58dcffa7dbc5974d14c7914f44233bef3':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.