Merge "VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions" into qt-r1-dev am: f22b39c457
am: 79f9484c6b

Change-Id: I12f7b7c9b52053317fcd0fddcfb166598e21a666