[automerger skipped] Merge "Remove old telephony Intent from protected-broadcasts" am: f7c0f3c698 am: 08cfc3c350 -s ours
am skip reason: Merged-In I32d891e514ee5a90564e510a5efb7dfa71293562 with SHA-1 3b385e4caa is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704171
Change-Id: I70c66c8c1fc1d3949abcdc5fb8d84e4b25869746
This commit is contained in: