Merge "dumpstate: add HAL log for wifi-specific bug report" am: 6a525c4773
am: 999a4ba562

Change-Id: Ia62f5bdb605a4c705c64a4a9e9f1f7ae0df1cfef