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

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



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