[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-d1-dev-plus-aosp am: fb93e94d96 am: ec5f9b1a06 -s ours am: 4b24985607 -s ours
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 46ada586e2 is in history
Change-Id: I973c33aedcce803dc3146a7ab797c3ab0443b106
This commit is contained in: