Fix race condition when using mPreserveTopNApps. am: f81d50e255 am: 705b064825

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15684473

Change-Id: I4735ad4a3373704d8683db171e9d7e608358ac07