[automerger skipped] Merge "support cellbroadcast data migration by dafault"...

[automerger skipped] Merge "support cellbroadcast data migration by dafault" into rvc-dev am: ef0740e2 am: 129cfacc am: 31e6e90e -s ours am: 1a4390ec -s ours

am skip reason: Change-Id I5e61c7e777526e038cd8d9971a2c5b87c00eaacb with SHA-1 1d4939ff is in history

Change-Id: I8ffb38787020f8978d2ed4cce278838cd4121de8