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 am: 94f1d9bf

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



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