Merge "Do stack collapse after stack reorder" into tm-dev am: 3ad36501

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



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