aml_cbr_331013010
Snap for 8570526 from 2536fe25a69f90b7c380dc4ddff269403ebe9a0b to mainline-cellbroadcast-release

Change-Id: I6b060906b4b9027d63699d62a8932c0761036d56