Merge "Debuggerd: Extend crash_dump timeout to 5 seconds"
am: b2bf7a5330

Change-Id: I9c34419ddfcaf80b3f535c8c9a9aeace601f6af5