Merge "Mark the task as reusable while clearing activities in the Task" into...

Merge "Mark the task as reusable while clearing activities in the Task" into tm-qpr-dev am: b9613ed1 am: d7ab244c

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



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