Merge "Reset the clearAllInProgress flag when the shade is collapsed" into...

Merge "Reset the clearAllInProgress flag when the shade is collapsed" into udc-dev am: ee9049be am: a6b4224d

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



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