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: I1e55ab6affae144c63f72de9b12fb81874b7ed5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>