[automerger skipped] Refactored cell broadcast area info support am: 0553853678 am: a22e77d2b4 am: 99e83ec933 -s ours
am skip reason: Change-Id I3170e097f7bc53295b3dacf6492b6bb43e45d5c2 with SHA-1 d634e5059e is in history

Change-Id: Id3800dc8d8b1aaa63aae76eb2aea9835e0ccbce7