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

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



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