Snap for 7478067 from 5819393ca04902c8fea8f07062d7e38f76aa36c5 to mainline-cellbroadcast-release

Change-Id: I6de12fc9300839c0f0b16d2a6dae1a8dfa1f089f