Snap for 8622994 from 1dda0b2a4a179763635ae92ac17b16008ebc8128 to mainline-cellbroadcast-release

Change-Id: Icd1546b7e309523b2387ea439ef1211654a400e3