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: I9ccc1bc50d543ed054f673dfd913db1cd8fafec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>