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: 81ced0ec am: 183ca8e3 am: e8058dd8

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



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