Merge remote-tracking branch 'upstream/master' into reland_android_pv

shell/platform/android/test/io/flutter/embedding/engine/PluginComponentTest.java

@@ -35,8 +35,6 @@ public void pluginsCanAccessFlutterAssetPaths() {
     FlutterInjector.setInstance(new FlutterInjector.Builder().setShouldLoadNative(false).build());
     FlutterJNI flutterJNI = mock(FlutterJNI.class);
     when(flutterJNI.isAttached()).thenReturn(true);
-    FlutterApplicationInfo emptyInfo =
-        new FlutterApplicationInfo(null, null, null, null, null, null, false);
 
     FlutterLoader flutterLoader = new FlutterLoader();