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

Change-Id: Ia785431a50d6fa6343a6cd67b31f57416004ad51