Merge "Fix GnssMeasurement state range check" into android10-tests-dev