Merge "[automerger skipped] Merge "Remove cellbroadcast_default_package config...

Merge "[automerger skipped] Merge "Remove cellbroadcast_default_package config as its unused now." am: a6338544 am: da7b487a -s ours" into rvc-dev-plus-aosp am: 2d4a3792 -s ours

am skip reason: Change-Id Id06456d23cc63c8cf1b4e26ba7f7d3b0c348eb46 with SHA-1 4c3681c0 is in history

Change-Id: Iee8f09abd78e838589dc4c97ed156e7340a8df79