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

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