Snap for 8564071 from cbb2e714a2890890991d72b3d8ce86f210c34e5c to mainline-cellbroadcast-release

Change-Id: I306b29fe90396be94fc53fa245820f9a12316935