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

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



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