Merge "dumpstate: avoid ':' in lshal files" into main am: d97e8bc3 am:...

Merge "dumpstate: avoid ':' in lshal files" into main am: d97e8bc3 am: 51dc4b13 am: 656dca79 am: bb3658a5 am: 84864e85

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



Change-Id: I01e1a8360240a33aa03d89aa466511fd23ea6c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>