[automerger skipped] Support maximum wait time for Cell broadcast
am: 1e1099a123 -s ours
am skip reason: change_id If3d8d7915f2d86da20c63e99bee01f30e3ea89c0 with SHA1 9f677a0790 is in history

Change-Id: Icdd16f0ebe762d5a07f85bb62af0c7e63ac677c2