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

Change-Id: I570fc669cf65d3a0499029b470b37b32d1ddf8af