Merge "Failed to get contact for voicemail after switch language" am: 7ef83871d9

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

Change-Id: Iad9608fc4e5fd9f10afffee0105ce547e46e3331