Merge "Debuggerd: Extend crash_dump timeout to 5 seconds am: 4f5f558d38  -s ours am: 293c0485b1  -s ours" into oc-dr1-dev-plus-aosp