[automerger skipped] Merge "Supported multiple cell broadcast receivers" am: 8853ce5e51 -s ours am: 12ce164010 -s ours
am: de178c8e3c -s ours
am skip reason: change_id I293fed4aafbac6c176d3635f9437c2fba5b05efd with SHA1 fade231c92 is in history

Change-Id: I52aa868ddc1e82351b855183a5708714020fd3fc