Snap for 7555280 from 5a2ead4f79e3b4c604edd450714bd1d925de1d4e to mainline-cellbroadcast-release

Change-Id: I448dfd2d787367e5622bcc847fbdbbb35e30fdaa