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

[automerger skipped] Merge "support cellbroadcast data migration by dafault" into rvc-dev am: ef0740e2 am: 5499acb4 -s ours am: 43ec8161 -s ours am: af753c37 -s ours

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

Change-Id: I71d8a47c332e162865d875f78f7ba2bfd2c29997