aml_cbr_331610010 (9849367,com.google.android.cellbroadcast)
Snap for 8564071 from 7771b626ec751b7c219f74b4298f4efc5557dbb4 to mainline-cellbroadcast-release

Change-Id: I379d887e5d5a683a45c3dfb678efbbb6097c6522