[automerger skipped] Merge "DO NOT MERGE Revert "Add SatelliteProxy"" into...

[automerger skipped] Merge "DO NOT MERGE Revert "Add SatelliteProxy"" into udc-dev am: 843ed39a am: cebce336 -s ours

am skip reason: subject contains skip directive

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



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