[automerger skipped] Merge "Remove old telephony Intent from...

[automerger skipped] Merge "Remove old telephony Intent from protected-broadcasts" am: f7c0f3c6 am: 08cfc3c3 -s ours am: ecb05377 -s ours am: d10ba70c -s ours

am skip reason: Merged-In I32d891e514ee5a90564e510a5efb7dfa71293562 with SHA-1 3b385e4c is already in history

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

Change-Id: I97dd90e273e533635370e3851681a32922e6e992