Merge "Fixed Shade freezing when tapped while collapsing" into tm-qpr-dev am: 3d0ea920

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



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