Merge "VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions" into android10-tests-dev