Merge "Cell broadcast receiver should not be replaced" into rvc-dev am: b31272ddcd

Change-Id: If2506f81f8d1c6f50a8614b33d25a199d08c5e9a