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

* commit '1bdbce295cd7978e50b5444420ed222ec6c6281c':
  [ActivityManager] Finish the failed-to-pause activity