[automerger skipped] Fixed display name not persisted am: fe01be9d am:...

[automerger skipped] Fixed display name not persisted am: fe01be9d am: b150a4d1 -s ours am: 010c8118 -s ours am: ce15b0c2 -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: If79ddab1d66b0221f7e36ae20ed610b55a6f5e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>