Revert "Enable VR DFM conditional install for DD-ready devices"

This reverts commit a45cf506.

Reason for revert: Breaking official build.

Original change's description:
> Enable VR DFM conditional install for DD-ready devices
> 
> The CL uses the new 'conditional modules' feature to auto-install the
> VR DFM upon updating Chrome on supported devices. This should provide a
> much better experience when launching Chrome from the DDH for the first
> time on devices where the cost of having the VR DFM unused is minimal.
> 
> This is only used on monochrome_bundle builds.
> 
> Bug: 961796
> Change-Id: I79b095205b5dd947484738034bf50a2a0c4c8ca8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1714144
> Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
> Commit-Queue: Will Cassella <cassew@google.com>
> Cr-Commit-Position: refs/heads/master@{#680060}

TBR=tiborg@chromium.org,cassew@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 961796
Change-Id: I9ca741bb68f1d91c6b65e314fc2dc3c9f0cf5128
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1717265Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680589}

chrome/android/features/vr/java/AndroidManifest.xml

@@ -8,17 +8,9 @@
     featureSplit="vr">
 
     <dist:module
-      dist:instant="false"
-      dist:title="@string/vr_module_title">
-      <dist:fusing dist:include="false" />
-      <dist:delivery>
-        <dist:install-time>
-          <dist:conditions>
-            <dist:device-feature dist:name="android.hardware.vr.high_performance" />
-          </dist:conditions>
-        </dist:install-time>
-        <dist:on-demand />
-      </dist:delivery>
+        dist:onDemand="true"
+        dist:title="@string/vr_module_title">
+        <dist:fusing dist:include="false" />
     </dist:module>
 
     <application>

chrome/android/features/vr/java/AndroidManifest_chrome_modern.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2018 The Chromium Authors. All rights reserved.
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file. -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dist="http://schemas.android.com/apk/distribution"
-    featureSplit="vr">
-
-    <dist:module
-        dist:onDemand="true"
-        dist:title="@string/vr_module_title">
-        <dist:fusing dist:include="false" />
-    </dist:module>
-
-    <application>
-    </application>
-</manifest>

chrome/android/features/vr/vr_module.gni

@@ -21,7 +21,3 @@ vr_module_desc = {
     loadable_module = "libvr_ui_dummy_lib.so"
   }
 }
-
-vr_chrome_modern_module_desc = vr_module_desc
-vr_chrome_modern_module_desc.android_manifest =
-    "//chrome/android/features/vr/java/AndroidManifest_chrome_modern.xml"

chrome/android/modules/chrome_feature_modules.gni

@@ -49,7 +49,7 @@ resource_packages_id_mapping = [
 # Modules shipped in Chrome Modern (Android L+).
 chrome_modern_module_descs = []
 if (enable_vr) {
-  chrome_modern_module_descs += [ vr_chrome_modern_module_desc ]
+  chrome_modern_module_descs += [ vr_module_desc ]
 }
 if (dfmify_dev_ui) {
   chrome_modern_module_descs += [ dev_ui_module_desc ]
@@ -57,10 +57,6 @@ if (dfmify_dev_ui) {
 
 # Modules shipped in Monochrome (Android N+).
 monochrome_module_descs = chrome_modern_module_descs
-if (enable_vr) {
-  monochrome_module_descs -= [ vr_chrome_modern_module_desc ]
-  monochrome_module_descs += [ vr_module_desc ]
-}
 if (enable_arcore) {
   monochrome_module_descs += [ ar_module_desc ]
 }