[automerger skipped] Merge "Remove unused cell broadcast code" into stage-aosp-master am: e8c43d17 am: 6d429f0f -s ours
am skip reason: Change-Id I0151ca0d93a61f69dd8b3066a8c60089876b6da5 with SHA-1 158fea7f is in history
Change-Id: Ib88106eef51e15e7f8edb1c2ac708460eb3d5f41