Merge changes from topic "phonenumber" am: 886bf03a2d

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

Change-Id: I90ca5ccbf686a975f479c2488ff34f82af12946a