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