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

Change-Id: Iac720ea8632979e3340c7d45a4cbb346cfacd7e7