am 380415b6: am 1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity"

* commit '380415b6431adeb8138bc328a926807b8ae41df9':
  [ActivityManager] Finish the failed-to-pause activity