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

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



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