Merge "Update CellBroadcastIntents API"
am: 6ec1a35516

Change-Id: Id2511ea6d3a465f3afd4d16d938b5fb2765ecd66