Merge "dumpstate: avoid ':' in lshal files" into main am: d97e8bc354 am: 51dc4b13a7

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

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