[automerger skipped] Merge "Support maximum wait time for Cell broadcast" am:...
[automerger skipped] Merge "Support maximum wait time for Cell broadcast" am: ef77ddcb am: 18bb5051 am: 7ae8a797
am: eb9461aa -s ours
am skip reason: change_id Ic93c0013cd46da1a8ebaa78011e5b99ff0eebe00 with SHA1 7f7695fd is in history
Change-Id: I5a59fe308b16edd26bff22793546d6ed2bf8fa77