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

Change-Id: I9757f9f0c17e57adef82e01048894f2a3fd51fe1