Snap for 10447354 from 6f3875a7c631777c3ce629036716cadaf42c3116 to mainline-cellbroadcast-release

Change-Id: I8b2850d4d136666a841fcc3a9241580e945352d0