[automerger skipped] Added area info support in cell broadcast service am: 87db6b74ba am: bd8106d00d am: e6f4527ef6 -s ours
am skip reason: Change-Id I682e579d797c35f1de032b93e0e0eb05e15928e0 with SHA-1 90af67b548 is in history

Change-Id: I227b40655b60fe1e4c447fbe8ee1cb37ebbd33ab