Merge "TeleService: Adapt edge-to-edge enforcement" into main am: 2bb02578fa

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

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