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

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

Change-Id: I09ebf81023406f2f192f95b15101424c71a0ebf1