Merge "Add getPhoneNumber/setPhoneNumber API" am: 692533e342 am: 600f4d03aa

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

Change-Id: I4c199ec81b3f30a3a12ae40af29185549387d34d