Merge "Revert "Update min_sdk_versions to match WifiTrackerLib"" into sc-dev