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

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

Change-Id: I30cabb573742959d0a3ad86e838c3f08f387a3b5