[automerger skipped] Merge "Add getPhoneNumber/setPhoneNumber API" am:...

[automerger skipped] Merge "Add getPhoneNumber/setPhoneNumber API" am: 692533e3 am: 600f4d03 am: 9be07bf5 am: bc92ff9c -s ours

am skip reason: Merged-In Iac651f2ca4269f20a2c7e87c7b6edf1d6c992867 with SHA-1 0594b4f4 is already in history

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

Change-Id: I277a447a6d89c46ba4f720199493f15382f0671b