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 am: 7cf96ecd

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



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