[automerger skipped] Refactored cell broadcast area info support am: 324ca000ac am: f7d161816c am: bf050e9b5d -s ours
am skip reason: Change-Id I2245c39f679d0ad94c9a1325edc553f362fdce7c with SHA-1 80e4320435 is in history

Change-Id: I7fad51db29fbc53f251ca2f17f8f8956b156944e