Merge "Revert "TeleService: Adapt edge-to-edge enforcement"" into main am: f441782178

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/3196977

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