[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 -s ours am: 6e72ed8749 -s ours am: d67e7d101c -s ours am: 07f59a8f2a -s ours
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63 is in history
Change-Id: Ia4875e8999c61b9713e7033a0b6568d5cac5d75e
This commit is contained in: