Merge "Format conference participant phone numbers to national for Japan" am: 52cdf7372d

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

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