[automerger skipped] Merge "Update satellite implementation based on updated...

[automerger skipped] Merge "Update satellite implementation based on updated APIs" into udc-dev am: 55b6e4f4 am: 5620a2b8 -s ours

am skip reason: Merged-In Ia83a9304ad40dd124dafad3fbf34c9ea2b308c51 with SHA-1 e32fa017 is already in history

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



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