am d543c3e1: Merge "[ActivityManager] Do not finish root activity when reset task"

* commit 'd543c3e113ffa82a63669feca540ca2e10b1576f':
  [ActivityManager] Do not finish root activity when reset task