Merge "SoftApManager: Move SoftApManager to WifiStateMachine thread"