[automerger skipped] Support maximum wait time for Cell broadcast
am: 7eaf885d12 -s ours
am skip reason: change_id Ie1898a27d50297880670052c6029b991d358ebb9 with SHA1 5f782de7d5 is in history

Change-Id: Ibce68e6eb3dba9873a3a442036cb9425a516c55d