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

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

Change-Id: Ie5d7f91fc1e83ff6e29e7180007d99d44b2d72e8