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