Merge "Format conference participant phone numbers to national for Japan" am: 64a687b051 am: 1a6dc94a04 am: 85b6d00237

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2146921

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