[automerger skipped] Merge "Do not attach the added recent task to TDA" am: 6004efd8ee am: a10f155b20 am: 7896757e9b -s ours

am skip reason: Change-Id Ibe09d7f0381705defe2fc82bf11339da2aaa6294 with SHA-1 e2871a4266 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4a36f0ac0e2e18bc30a406659c27e43178a37ea