Merge "Fix GnssMeasurement state range check" am: 43f1d331e3

Change-Id: I245b97dd441e20e59116e3090fd55f3e8ca68307