[WebApk] Fix WebShareTarget after introducing aliases.

<activity-alias> needs to come after the <activity> it's pointing to.
Manifest merging was doing this for us but the server doesn't it.
Simples fix is to set correct order ourselves

Change-Id: I20d5184f27fe3b84a90afcdf40f6ba731b1c4a43
Reviewed-on: https://chromium-review.googlesource.com/c/1260204Reviewed-by: Glenn Hartmann <hartmanng@chromium.org>
Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596407}

chrome/android/webapk/shell_apk/AndroidManifest.xml

@@ -38,6 +38,9 @@
             {{/intent_filters}}
             {{{raw_intent_filters}}}
         </activity>
+        <activity android:name="org.chromium.webapk.shell_apk.ShareActivity"
+                  android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                  android:excludeFromRecents="true"/>
         {{#share_template}}
         <activity-alias android:name="org.chromium.webapk.shell_apk.ShareActivity{{{index}}}"
                   android:label="{{{title}}}"
@@ -53,9 +56,6 @@
           </intent-filter>
         </activity-alias>
         {{/share_template}}
-        <activity android:name="org.chromium.webapk.shell_apk.ShareActivity"
-                  android:theme="@android:style/Theme.Translucent.NoTitleBar"
-                  android:excludeFromRecents="true"/>
         <meta-data android:name="org.chromium.webapk.shell_apk.shellApkVersion" android:value="{{{shell_apk_version}}}" />
         {{#bound_webapk}}
         <meta-data android:name="org.chromium.webapk.shell_apk.runtimeHost" android:value="{{{runtime_host}}}" />

chrome/android/webapk/shell_apk/current_version/current_version.gni

@@ -12,4 +12,4 @@
 # //chrome/android/webapk/shell_apk:webapk is changed. This includes
 # Java files, Android resource files and AndroidManifest.xml. Does not affect
 # Chrome.apk
-current_shell_apk_version = 60
+current_shell_apk_version = 61