Merge "Re-adding the task to recents once task affinity updated" into tm-dev am: 7391919a

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



Change-Id: I77007124e7e3dff7ec0d7de2975e3ee3c5a6bde0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>