Snap for 9847922 from 207ca05a44aa1247846fe3878bc82be2b36c8327 to mainline-cellbroadcast-release

Change-Id: I2e2afafefaad14b58e759a27d3a513dcde9f0c22