Merge "Fixed animation breakage when QS area tapped during expand/collapse"...

Merge "Fixed animation breakage when QS area tapped during expand/collapse" into tm-qpr-dev am: 4dfa86ae

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



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