[automerger skipped] Fixed permananent failure behaviors am: 3ab10d5f -s ours

am skip reason: Merged-In Ic147c44b0729e8204cb494eb80932ef2c11f9861 with SHA-1 b05602f5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/20293817



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