Merge "Fix carrier name animation during qqs expand" into udc-dev am:...

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

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



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