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

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

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