[automerger skipped] Merge "Support maximum wait time for Cell broadcast" into qt-qpr1-dev
am: 319c12bb -s ours
am skip reason: change_id Ic93c0013cd46da1a8ebaa78011e5b99ff0eebe00 with SHA1 257f2293 is in history
Change-Id: Id49d5737d493b13a3077820914054225a1117dce