Snap for 10447354 from 5a7c4a2a606ea37c1b60eb0ba262720a62ab3d52 to mainline-cellbroadcast-release

Change-Id: I638e9eff7efe983f8940c73aa6ec915e9cdecae2