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

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

Change-Id: I4537fd3cf6e51b245b68d41db8f0e5a681a5ff44