[automerger skipped] Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc am: f4d1912123 am: 31c0f50065 -s ours am: 357505c6aa -s ours
am skip reason: Change-Id Ic38372d96918c17d3cd61832ff668fcfc61f0686 with SHA-1 c2ee364f6f is in history
Change-Id: I997a0f56799c99f77a53105ad725bdfd1a4ee826
This commit is contained in: