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