[automerger skipped] Merge changes from topic "phonenumber" am: 886bf03a am:...

[automerger skipped] Merge changes from topic "phonenumber" am: 886bf03a am: e88de1e6 am: e32ed489 am: d21df6ed -s ours

am skip reason: Merged-In I24f5ebf228bf1ae28f4d7b32ddef222482114eae with SHA-1 bbb01fcb is already in history

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

Change-Id: Ia94f82f68a6588a6011fd2b43b3165decf47788a