[automerger skipped] Merge "Update telephony OWNERS file" am: 7ad87a83 am:...

[automerger skipped] Merge "Update telephony OWNERS file" am: 7ad87a83 am: 15b53f63 -s ours am: a2ce1839 -s ours

am skip reason: Merged-In I285eefd9abe2d8bef86ce189b6c19ee273b9e924 with SHA-1 874b7164 is already in history

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

Change-Id: I9e764bed84fdf19c5ce297ddd2a3b68980433915