[automerger skipped] DO NOT MERGE Revert "Add SatelliteProxy" am: 0e85b8c3 am: 3ff2bb45 -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: Ic069401a944069b4156e7e9b2f302d0162b3453d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>