[automerger skipped] Support maximum wait time for Cell broadcast am: 47639605 -s ours
am: 99f2c32b -s ours
am skip reason: change_id Ic93c0013cd46da1a8ebaa78011e5b99ff0eebe00 with SHA1 7f7695fd is in history
Change-Id: Ib83bf9da5f88b3e52ce0b6909fcded49fcef7003