[automerger skipped] Fixed display name not persisted am: fe01be9d am: b150a4d1 -s ours

am skip reason: Merged-In I05ad5e129edcb9e7c426a1ea1f096d2447939e61 with SHA-1 e8ca5932 is already in history

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



Change-Id: I1e2355f055b9a130398609318c441425c578a9e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>