Merge "Keep satellite gateway service alive during a session" into udc-dev am:...

Merge "Keep satellite gateway service alive during a session" into udc-dev am: 8d28545a am: 9aab0c3f

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



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