Merge "Fix an issue where tasks moving to front would collapse the stack." into tm-dev am: 13a28fff am: 668dddcd am: 406e3725 am: e62670df

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



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