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