Snap for 11041982 from d7aa788fdcc8aca3371553385fd318f030fbaae6 to mainline-cellbroadcast-release

Change-Id: Ic4b992521987b931a47f85802c6ff71003aae381