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

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

Change-Id: Ia5e746daeaa1a89d098411d40f41537287e2dfaa