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

[automerger skipped] Fixed permananent failure behaviors am: 3ab10d5f -s ours am: 3e8c63f2 -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: I4029f5043465be440e1e341b1a1c920df42c8179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>