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

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



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