Merge "Move to non-static WifiTrackerLib isVerboseLoggingEnabled() methods" into main