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

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



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