Merge "Re-adding the task to recents once task affinity updated" into tm-dev...

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

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



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