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

Change-Id: Ic85fb8afd78fd37801368d0f3f5d95fcaf67a81a