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

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

Change-Id: Ife2b464a2ded85810d27cd9f8d7642fa3eccc4fc