[automerger skipped] Merge "Update owners file" am: 1f816647a1 am: d95c9d9bec am: 315aec558b -s ours am: ab0a395ad6 -s ours

am skip reason: Merged-In I4c61c7f829d1c881ea3541d983f3c2bb9626b74f with SHA-1 04d32de5a2 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1884455

Change-Id: I20adb3154d26355a0118185365b09a6fd61dc6a5