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

Change-Id: I5204d70c04995844cca5623f847db7b41ad7a2ea