Merge "Update VTS test to blacklist only non-GPS satellites" into pi-dev