Merge "Fix an issue where tasks moving to front would collapse the stack."...

Merge "Fix an issue where tasks moving to front would collapse the stack." into tm-dev am: 13a28fff am: 668dddcd am: 0334b062 am: 3c99cf51

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



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