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

Change-Id: I2c39c71499e538086884c771d2f7f14501136b86