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