[automerger skipped] Merge "Expose the carrier signaling broadcasts" am:...

[automerger skipped] Merge "Expose the carrier signaling broadcasts" am: b8cc5329 am: 05bc834d am: 4a264df4 -s ours am: 54d4ac8d -s ours

am skip reason: Change-Id I15d032ee1e31d9be847c2f084161f8555c8172c1 with SHA-1 16359f38 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53adccdec215a24efe4c8443a0072d3eb9cd52e9