Merge "Owners file cleanup." am: 2f7851e135 am: ceaa6a68ec

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

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