This partially reverts commit 08744836fe.
Reason for revert: Unit tests are out of sync with prebuilt Wifi mainline module
Bug: 168158154
Change-Id: I0cda9de836b6f00a06474515f17e67194c6246cd
Test: Treehugger
Merged-In: I875d0d0584d71fe6dd3fedc8f5371e0b5ed2e5e5