Merge "Fixed phone number not seen on about page" into udc-dev am: 4b6db9c3 am: 94373d50

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



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