[automerger skipped] Merge "Update owners file" am: 9b09cbf168 am: f8a3d83bb7 am: b1f8f350a9 -s ours am: f56135a9c8 -s ours

am skip reason: Merged-In I8be9321a3b30abdae955eff569d77e146b5051b1 with SHA-1 a54d1e032b is already in history

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

Change-Id: Iae1b995e103ea5a16de2de95aac1f5d3fa432131