Snap for 11273583 from 9c5860a467857ea872d61bdea6dbbacaba28a0b1 to mainline-cellbroadcast-release

Change-Id: I3b732b77701adf41acc4870312dcca7e6886228b