[automerger skipped] Merge "Refactored cell broadcast area info support" am:...
[automerger skipped] Merge "Refactored cell broadcast area info support" am: c36cc4e1 am: 62480277 am: 403ab5da -s ours
am skip reason: Change-Id If6a0a0c6a76e8b90a8feaea1e2771993e2d0edfe with SHA-1 c4da22a2 is in history
Change-Id: Id0c02420887f2d9a9420444064a2434162f8028e