Merge changes from topic "phonenumber" am: 886bf03a2d am: e88de1e6df am: e32ed4893f

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

Change-Id: I70e56342d9e519b04e178f009278f49e7816cc27