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

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

Change-Id: I6a8304b673ef34dcea2b34717a096032d47b6a07