Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo