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: f5e0e12d am: 21b43a66

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



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