Merge "Update owners file" am: 9b09cbf168 am: f8a3d83bb7

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

Change-Id: I6479a0320f466d1f7283f5c36fdad25abff74e69