[automerger skipped] Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
am: 76f2b27e3b
-s ours am: 78c75b1d10
-s ours am: 8544e130a9
-s ours
am skip reason: Change-Id Ic38372d96918c17d3cd61832ff668fcfc61f0686 with SHA-1 c2ee364f6f
is in history
Change-Id: I187a03c54beb09350b141bc1e64b98176b6874fb
This commit is contained in: