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

Change-Id: Ic7bd9b309d7e9fe7a2317c4dcba85bd87fa1431f