This partially reverts commit 43a326cdb3.
Reason for revert: Unit tests are out of sync with prebuilt Wifi mainline module
Bug: 168158154
Test: Treehugger
Change-Id: I8add72b6de6e470a09a745c32b3e2fea764fc692
Merged-In: I6afba22e4081ba58884ffd1b560b81b1e9960132