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

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



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