Merge "Fixed phone number showed in bugreport" into udc-dev am: 2ca57a66

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/21591421



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