Merge "[automerger skipped] Merge "Remove cellbroadcast_default_package config as its unused now." am: a633854473 am: da7b487a09 -s ours" into rvc-dev-plus-aosp am: 2d4a3792c2 -s ours am: af3f8cb385 -s ours

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

Change-Id: I63133981888668b1faeff540e6da9cb47170e0bc