aml_cbr_330911010
Snap for 8564071 from 38d9be81be809febb78b79b841f66d051ce499aa to mainline-cellbroadcast-release

Change-Id: I38583b167ddd279cb0816c6f7c5688475d114fa7