Merge "Fix minor bugs with calling APIs through vendor satellite service" into...

Merge "Fix minor bugs with calling APIs through vendor satellite service" into udc-dev am: 560bc9e3 am: e12ddb46

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



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