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

[automerger skipped] Merge changes from topic "phonenumber" am: b2c75c45 am: a30fc092 am: 8d825a11 am: 5e3ca4a0 -s ours

am skip reason: Merged-In Ie25512ac6ab00ae8b771b3adc6188d1d33381b52 with SHA-1 71b41aa7 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1920745

Change-Id: Ic12f6edfcfe3211852ba66eaaf34db45fa094fca