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

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

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