[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20
am: 7b0f05bc69
-s ours am: b2022e37cc
-s ours
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 cba6d9f67a
is in history
Change-Id: I0e0f8014dc01a33bf3921b5ad027c5187f0b5e83
This commit is contained in: