Snap for 7478067 from 10c0065d72656f73f50650828a203e7c03751342 to mainline-cellbroadcast-release

Change-Id: Icd8a510aadb0c375ec52ba2ab6bd38474fdb3bd2