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

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

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



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