Merge "AOSP Cellbroadcast renaming" into rvc-dev