[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: e7a5bdc4 -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: I43737afdb0f4abe31e8ebc342c9f8d5f296476c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>