Merge "Only collapse stack on shade state change" into tm-qpr-dev am: 5932f31d am: 9df0ec60

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



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