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

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

Change-Id: I880dfdaeefbb281dfc7494d4a2fc655f50160b01