[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 skip reason: Change-Id I5e61c7e777526e038cd8d9971a2c5b87c00eaacb with SHA-1 1d4939ff is in history
Change-Id: Id225d2579575358a001d1af52605c1dbef0cca66