Introduce ChromeVR to Chrome on Android (behind a build flag)

chrome/android/java/AndroidManifest.xml

Index: chrome/android/java/AndroidManifest.xml
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index ea8d11b72dad08a24ecf47303ebcab817af0b8b9..46fef9e7be419c456be3ece5ad64c0b099bb2b25 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -52,6 +52,11 @@ by a child template that "extends" this file.
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
+    {% set enable_vr_shell = enable_vr_shell|default(0) %}
+    {% if enable_vr_shell == "true" %}
+    <!-- Required to read the paired viewer's distortion parameters. -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    {% endif %}
 
     <permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
     <permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
@@ -156,11 +161,6 @@ by a child template that "extends" this file.
                 {% if channel in ['dev', 'canary', 'default'] %}
                 <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
                 {% endif %}
-                {% set enable_vr_shell = enable_vr_shell|default(0) %}
-                {% if enable_vr_shell == "true" %}
-                <!-- Show icon in Daydream app launcher. -->
-                <category android:name="com.google.intent.category.DAYDREAM" />
-                {% endif %}
             </intent-filter>
             <!-- Matches the common case of intents with no MIME type.
                  Make sure to keep in sync with the next filter.  -->
@@ -345,6 +345,22 @@ by a child template that "extends" this file.
              android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
              android:hardwareAccelerated="false">
         </activity>
+        {% if enable_vr_shell == "true" %}
+        <activity android:name="org.chromium.chrome.browser.VrActivity"
+             android:theme="@style/MainTheme"
+             android:windowSoftInputMode="stateAlwaysHidden"
+             android:launchMode="singleTask"
+             android:screenOrientation="landscape"
+             android:hardwareAccelerated="false"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <!-- Show icon in Daydream app launcher. -->
+                <category android:name="com.google.intent.category.DAYDREAM" />
+           </intent-filter>
+        </activity>
+        {% endif %}
         <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity2"
              android:theme="@style/TabbedModeTheme"
              android:exported="false"