Merge "Revert "Enable location CTS tests in presubmits""