Snap for 10447354 from 8cefae833949cddadf7068f8bcab5511329ede38 to mainline-cellbroadcast-release

Change-Id: I7222786333bcbb5aa02c1a3bc6c1927d7a5b1c05