Merge "Revert "Enable wifi firmware debugging on bullhead"" into mnc-dr-dev