Merge "Fix telephony persistent voicemail notification" into udc-d1-dev am: ad62adad83

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

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