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

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



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