Snap for 10447354 from 8686f19c255c36095c0dcf087901a5a8f7a00750 to mainline-cellbroadcast-release

Change-Id: Ib2712badf0994f74b9fcd3f5e057e5c5d32d1322