[automerger skipped] Merge "[Telephony] Fix the display name cannot be updated after OTA" into rvc-qpr-dev am: 03b4ab92 am: 56a94061 -s ours

am skip reason: Change-Id Ia1824a684af388682718263fc6154b4f5fb27b33 with SHA-1 ae079e69 is in history

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

Change-Id: Ib1b1334c84b52a229b6e8d08f19e59830b4fbc52