[automerger skipped] Merge "Use new broadcasts in CarrierSignalAgent" am:...

[automerger skipped] Merge "Use new broadcasts in CarrierSignalAgent" am: 155d626f am: f28e6660 am: e8d1a4df -s ours am: 5907177d -s ours

am skip reason: Change-Id Ib8898383c321591fa2a9ef55e383b28d2fa7240a with SHA-1 37282f48 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1612702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0703f367ee4a74c005f5c2c3eb39271a477965b