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

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

Change-Id: Ie12e38283049378b685ee72663bd45b080535273