Snap for 8603585 from c5d7818747105486d5e7b6a8647a69d6d87e450d to mainline-cellbroadcast-release

Change-Id: I511172a0f20bf6b1aae1d8ece8ebf70bc48ff1a3