Merge "Support maximum wait time for Cell broadcast"
am: 156f347db4

Change-Id: Id6bdf363bc2819e2e16a9ee2b67e0ab449e5c09d