[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 am: 008c2db1 am: 1731231c -s ours

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

Change-Id: Ibdf03dbbd04bcc156270e69ab999cb6305584b28