Snap for 8564071 from 0899a09b09a65f576a372db1c50c2f3c0bd36aa0 to mainline-cellbroadcast-release

Change-Id: I505f390cc05969276ec8764e6af27ecc4a491e70