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

Change-Id: I08d29451c56e9f0405399eddbc3c4fc662ee1b6a