Snap for 9847922 from c7197a13fdeb389d50478e848d4ccae9efee8399 to mainline-cellbroadcast-release

Change-Id: Iebc0b0737cfb922fcd954127031716ae5fbf950a