Merge "Support maximum wait time for Cell broadcast"
am: 87ec57741b

Change-Id: Ia1a385c5de9cc97dadb3aeb0482c4f0ce9803573