Snap for 7478067 from 4c30b7013210d1dcd48d648aaa633328cb2e5777 to mainline-cellbroadcast-release

Change-Id: I29e8f4bc16b491a68e0bf3d020f523193a4b12ed