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

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



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