Snap for 10447354 from d212ec450807f0029bb95cb37040f9126d751761 to mainline-cellbroadcast-release

Change-Id: I8f536eeca161808d7002d77ee05efc931dbaf609