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

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

Change-Id: I8c487d6e8ee925672c422162b402c0f3343bf360