Merge "dumpstate: add support for wifi-specific bug report"