FlpAPIClient renamed to BatchingAPIClient GnssMeasurementAPIClient renamed to MeasurementAPIClient Change-Id: Ic0fae37fd1d798796cb918ddcf141913c6cc3c6e CRs-fixed: 1112712