Merge "Owners file cleanup." am: 2f7851e135

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

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