Merge "dumpstate: Remove wpa_cli usage" into oc-dr1-dev am: 516e0c3738
am: aaf93208bf

Change-Id: Ibfecc35fb6d79028d734b473420553c9a51a83b9