Merge "dumpstate: more time for non-zipping lshal debug" am: 84ea3dee04

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1435054

Change-Id: Ide5a1c8a4723baa983109f65bc8e64bd5896074a