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: 7993706d am: c80ffdb6

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



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