Snap for 7080740 from fc98f2cf3827da932c02bdbaf659bda6a93022ab to mainline-cellbroadcast-release

Change-Id: Ic32bee8d7362594de5be8bfd9a2e987fd80b7226