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

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

Change-Id: Iea2aec779b046e4705d32ae85a15dcf5ca55dbab