Merge "dumpstate: Fix wifi list of networks dump" into klp-dev