Merge from vscode 2cfc8172e533e50c90e6a3152f6bfb1f82f963f3 (#6516)

* Merge from vscode 2cfc8172e533e50c90e6a3152f6bfb1f82f963f3

* fix tests

src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts

@@ -84,7 +84,7 @@ suite('AIAdapter', () => {
 	});
 
 	teardown(() => {
-		adapter.dispose();
+		adapter.flush();
 	});
 
 	test('Simple event', () => {

src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts

@@ -30,7 +30,7 @@ class TestTelemetryAppender implements ITelemetryAppender {
 		return this.events.length;
 	}
 
-	public dispose(): Promise<any> {
+	public flush(): Promise<any> {
 		this.isDisposed = true;
 		return Promise.resolve(null);
 	}