[automerger skipped] Merge "Supported multiple cell broadcast receivers" am:...

[automerger skipped] Merge "Supported multiple cell broadcast receivers" am: 8853ce5e -s ours am: 12ce1640 -s ours am: de178c8e -s ours am: db87e208 -s ours
am: 7cb17a8d -s ours
am skip reason: change_id I293fed4aafbac6c176d3635f9437c2fba5b05efd with SHA1 fade231c is in history

Change-Id: Ieaef34394f0c7904809b06578f183ba588106583