Bug: 30041228
Test: WiFi tethering, client mode continues to function

Change-Id: I95a583ad4d57642f4731e415abb77732df5289ac
(cherry picked from commit fb5b13ee)