Merge "dumpstate: Increase timeout for lshal"
am: fc2c726547

Change-Id: I2d28294b5ec5ee0406513f6a49c9f05d83cbd374