Snap for 8564071 from ee86670715b2f28028e6c270e07dcbd56882c5ec to mainline-cellbroadcast-release

Change-Id: I36fec2edd8d09818ea1c0025f8b8c23869807746