Merge "Fix showing duplicated recent tasks in Recents" into sc-v2-dev am: fcbb6a51

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

Change-Id: I4b200b6a6d4954dd024c088486697b091eebc2c7