Merge "Add STATE_2ND_CODE_LOCK to GnssMeasurementState"