Merge "Clarify number format expectations for get/setPhoneNumber" am: af4fc5fb39 am: c1fe8d36d0

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

Change-Id: Ie9f16a17e8e3b8e30fca15c31456bf7549f7ea01