[automerger skipped] Merge "Refactored cell broadcast area info support" am: c36cc4e120
am: 62480277ed
am: 403ab5da4d
-s ours
am skip reason: Change-Id If6a0a0c6a76e8b90a8feaea1e2771993e2d0edfe with SHA-1 c4da22a2ce
is in history
Change-Id: Id0c02420887f2d9a9420444064a2434162f8028e
This commit is contained in: