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

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

Change-Id: I6325eba3936ada7591d340156743ce48b36c0bd4