Merge "Add an API in ITelephony to update satellite service package" into...

Merge "Add an API in ITelephony to update satellite service package" into udc-dev am: 43e2ef9d am: 3a53c4a8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22277161



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