Merge "Merge "Adjusted the expand animation to be smooth again" into rvc-dev...

Merge "Merge "Adjusted the expand animation to be smooth again" into rvc-dev am: 8b9d2ed3 am: 926c990b am: cd929fcc" into rvc-qpr-dev-plus-aosp am: d96dfa71

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

Change-Id: If98ea3067a1ac98220d931b5d0c6c9129e1a0d6b