Snap for 8193750 from 1a7c576d2d3c77f3dd09393ca261d0d32e201c87 to mainline-cellbroadcast-release

Change-Id: I8183be0f99a54a32b8e5c10756decdda0763f777