am e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity."

* commit 'e4d4e22f26bfd36a553fb24232d2fd4ddf4fc907':
  [ActivityManager] Avoid improper resume top activity.