[automerger skipped] Merge "Fix telephony persistent voicemail notification" into udc-d1-dev am: ad62adad83 am: f35b39f07f -s ours

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

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

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