Merge "Remap no sim and no service call fail causes to valid telephony codes."...

Merge "Remap no sim and no service call fail causes to valid telephony codes." into tm-qpr-dev am: 07b0164f

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



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