Snap for 7478067 from 5a02b20d2c4fc03e6d248bacb943c5263579248e to mainline-cellbroadcast-release

Change-Id: I200dd566675bdc3a531681382138cf970fff8a92