Merge "Revert "Revert "Fixed animation breakage when QS area tapped during...

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

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



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