Merge "Use proper satellite error codes" into udc-dev am: 35ea8087 am: 7cb456d4

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



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