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

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

Change-Id: I5132957511a2d6bd51c81d4636a92d52c0c9dbc3