Snap for 10447354 from b185bce3ef8fae85e02aba90b6f5e85d1a416276 to mainline-cellbroadcast-release

Change-Id: Id99f71c4913304cf287bb8e5a9962a907bb519b3