[automerger skipped] Merge "Support maximum wait time for Cell broadcast" into qt-qpr1-dev
am:c12bf8a9e0-s ours am skip reason: change_id If3d8d7915f2d86da20c63e99bee01f30e3ea89c0 with SHA19f677a0790is in history Change-Id: Iffad6f1039daa8a6c8f53ef6b7bfd96d674819ee
This commit is contained in: