[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 -s ours am: 6e72ed8749 -s ours am: 6495886a7e -s ours am: 458abbad70 -s ours am: 047c8b9c59 -s ours
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63 is in history
Change-Id: Ia55b0a09b6e94c4107723ced90fb987331b90b39
This commit is contained in: