[automerger skipped] Fix telephony persistent voicemail notification am: d6608f01e1 -s ours

am skip reason: Merged-In Ib022a0d13ae314d79b7841540e368fa1d76bfaad with SHA-1 78ad84e351 is already in history

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

Change-Id: Icd3921100cb85b88c686a2779c9a452fe2665c61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>