Snap for 8626064 from ecc94a1d1e4b578e81bcba91e4d22dea981892dd to mainline-go-cellbroadcast-release

Change-Id: I4e4925e826017dcc92a33f731487711543754468