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

Change-Id: I50197e80abf3c661f0c9c909691a3fcbf8980d96