[automerger skipped] Merge "dumpstate: more time for non-zipping lshal debug"...

[automerger skipped] Merge "dumpstate: more time for non-zipping lshal debug" am: 84ea3dee am: 94dbcdfd am: 40d3843f am: c44df0a4 -s ours

am skip reason: Change-Id If9e8169ff15842ea4ae4a9ff3d8a641216dc93bd with SHA-1 d3646e03 is in history

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

Change-Id: If337fcc82d9cc5db00a0434dd05593dc0bcb0405