Merge "Fix GnssMeasurement JNI for 1.1" into pi-dev