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

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

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