Snap for 11507696 from 136628263d5783c292cbc72486987778fa251f6c to mainline-cellbroadcast-release

Change-Id: I11060fb8c886a5108316cf1b146cf7d9f93d93dd