[automerger skipped] Merge "Support maximum wait time for Cell broadcast" am: 156f347db4 am: 0362123033 am: 90247580a7
am: 7af3d7f0c0 -s ours
am skip reason: change_id If3d8d7915f2d86da20c63e99bee01f30e3ea89c0 with SHA1 02d6ac0f20 is in history

Change-Id: Ifca1d768fd0b423dbad7193526491da6517e7767