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

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

Change-Id: Iafb01a3d2a8287b5bf4834988a88e232ff00855d