[automerger skipped] Merge "Remove old CellBroadcastIntentsTest" am:...
[automerger skipped] Merge "Remove old CellBroadcastIntentsTest" am: 615aabd8 am: b1651f8d am: 5ea32992 -s ours
am skip reason: Change-Id Ia92317264a95daf1c2a019a97dd7e97b0191754c with SHA-1 f95d1599 is in history
Change-Id: I917eea8a9008f9347bef97d0576ce7854d5ddf19