Merge "Fix that voicemail number displayed as unknown after reboot device" am: f4da55a7f5 am: 7fd6cc9704 am: df2dcaf31f

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

Change-Id: I49636949f3a3175eaf5c56639551ec47ef6ad841