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

Change-Id: I53ad80534d0c8d4b70bdeef928232c342b0467c0