Snap for 10447354 from e72d0b88c6b4dacf2789f39b418e95829a8f9145 to mainline-cellbroadcast-release

Change-Id: I212428646539ce28a90ad924a5b40f41d6d373e4