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

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

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