[automerger skipped] Merge "Update telephony OWNERS file" am: 4648a8f9 am:...

[automerger skipped] Merge "Update telephony OWNERS file" am: 4648a8f9 am: 0b8a77d4 -s ours am: 9dd6db29 -s ours

am skip reason: Merged-In I7b0c70ff193c64ff7a569c899107441c8de867cd with SHA-1 feef48eb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1785418

Change-Id: I7ce6ca828e8888b8ac5918f690815c3591ee699f