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

am skip reason: skipped by user jackyu

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



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