Merge "Fix carrier name animation during qqs expand" into udc-dev am: f79d65f0 am: 687edcc4

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



Change-Id: I401c584e07288282014ec120a2abd1a5eff6a8cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>