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

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

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



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