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

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

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

Change-Id: Ifc630a1267c6d1ed643df4b974c8c249798dd99d