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

Change-Id: I76ea1958df3bae8967e0242c2b7b9186d86abfc7