[automerger skipped] Merge changes from topic "permanent_failure_cause" am:...

[automerger skipped] Merge changes from topic "permanent_failure_cause" am: 9f4eac9e am: 4ce6936e -s ours am: 85b716c3 -s ours

am skip reason: skipped by user jackyu

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



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