Snap for 7478067 from cc1945d397e61b1967bef5f5e11ebff6b303e68f to mainline-cellbroadcast-release

Change-Id: Ia54cb5cc10a49c146eb302bfe98f945f6a05d9f8