[automerger skipped] Merge "Fix that voicemail number displayed as unknown after reboot device" into rvc-qpr-dev am: 96abc00afa -s ours

am skip reason: Change-Id I23d8eb4f6233feaf49b1e880feb212b9bb5b7c3b with SHA-1 863eac015b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/12549785

Change-Id: I35ca0f517243f4fcd5b8609ff4fb3381614e195d