Snap for 11273583 from eebc592ee23940d44db20f78bfb4cdb50533416b to mainline-cellbroadcast-release

Change-Id: I27e04d1da90648623f5df614261003566fb1e9fe