Revert "[Android WebAPK] Create resources for web shortcuts."

This (mostly) reverts commit 274ea563,
excepts that it increments the current_version.gni instead of
reverting it.

Reason for revert: I need to modify the shell apk and push it now
but this CL needs to wait for WAM server change to be pushable.

Original change's description:
> [Android WebAPK] Create resources for web shortcuts.
>
> Resources used need to be pre-declared in the shell.
>
> Since we don't know how many shortcuts are needed for a web app until
> the creation request, we create 4 copies of the needed resources to
> declare a shortcut, since that is the maximum number of shortcuts
> allowed on Android.
>
> The following resources are needed (per shortcut):
> - name
> - short_name
> - icon (placeholder taken from
>    https://material.io/resources/icons/?icon=filter_1&style=baseline)
>
> The shortcuts.xml is also partially generated to use the resources, so
> that building the shell apk doesn't fail. They are all disabled by
> default, and will need to be re-enabled on the server-side.
>
> Bug: 1010471
> Change-Id: I5371b145afd943029de8eb679b0cf3044545cbe3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1875755
> Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
> Reviewed-by: Glenn Hartmann <hartmanng@chromium.org>
> Commit-Queue: Rayan Kanso <rayankans@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#709189}

Bug: 1010471
Change-Id: Iee87449e0c2f60117e542b605d8cd08beffc0ff7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1885250Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Commit-Queue: Henry Jian <hzjian@google.com>
Cr-Commit-Position: refs/heads/master@{#710352}

chrome/android/webapk/shell_apk/res/xml/shortcuts.xml

 <shortcuts xmlns:android='http://schemas.android.com/apk/res/android'>
-
-  {{#shortcut_1}}
-  <shortcut
-    android:shortcutId='shortcut_1'
-    android:icon='@drawable/shortcut_1_icon'
-    android:shortcutShortLabel='@string/shortcut_1_short_name'
-    android:shortcutLongLabel='@string/shortcut_1_name'>
-      <intent
-          android:action='android.intent.action.MAIN'
-          android:targetPackage='{{{manifest_package}}}'
-          android:targetClass='{{{target_class}}}'
-          android:data='{{{launch_url}}}' />
-  </shortcut>
-  {{/shortcut_1}}
-
-  {{#shortcut_2}}
-  <shortcut
-    android:shortcutId='shortcut_2'
-    android:icon='@drawable/shortcut_2_icon'
-    android:shortcutShortLabel='@string/shortcut_2_short_name'
-    android:shortcutLongLabel='@string/shortcut_2_name'>
-      <intent
-          android:action='android.intent.action.MAIN'
-          android:targetPackage='{{{manifest_package}}}'
-          android:targetClass='{{{target_class}}}'
-          android:data='{{{launch_url}}}' />
-  </shortcut>
-  {{/shortcut_2}}
-
-  {{#shortcut_3}}
-  <shortcut
-    android:shortcutId='shortcut_3'
-    android:icon='@drawable/shortcut_3_icon'
-    android:shortcutShortLabel='@string/shortcut_3_short_name'
-    android:shortcutLongLabel='@string/shortcut_3_name'>
-      <intent
-          android:action='android.intent.action.MAIN'
-          android:targetPackage='{{{manifest_package}}}'
-          android:targetClass='{{{target_class}}}'
-          android:data='{{{launch_url}}}' />
-  </shortcut>
-  {{/shortcut_3}}
-
-  {{#shortcut_4}}
-  <shortcut
-    android:shortcutId='shortcut_4'
-    android:icon='@drawable/shortcut_4_icon'
-    android:shortcutShortLabel='@string/shortcut_4_short_name'
-    android:shortcutLongLabel='@string/shortcut_4_name'>
-      <intent
-          android:action='android.intent.action.MAIN'
-          android:targetPackage='{{{manifest_package}}}'
-          android:targetClass='{{{target_class}}}'
-          android:data='{{{launch_url}}}' />
-  </shortcut>
-  {{/shortcut_4}}
+    {{{shortcuts}}}
 </shortcuts>

chrome/android/webapk/strings/android_webapk_strings.grd

@@ -139,30 +139,6 @@
       <message name="IDS_NOTIFICATION_CHANNEL_NAME" desc="The user visible name of the default notification channel of the WebAPK.">
         General
       </message>
-      <message name="IDS_SHORTCUT_1_NAME" desc="The name of the first shortcut." translateable="false">
-        Shortcut 1
-      </message>
-      <message name="IDS_SHORTCUT_1_SHORT_NAME" desc="The short name of the first shortcut." translateable="false">
-        Shortcut 1
-      </message>
-      <message name="IDS_SHORTCUT_2_NAME" desc="The name of the second shortcut." translateable="false">
-        Shortcut 2
-      </message>
-      <message name="IDS_SHORTCUT_2_SHORT_NAME" desc="The short name of the second shortcut." translateable="false">
-        Shortcut 2
-      </message>
-      <message name="IDS_SHORTCUT_3_NAME" desc="The name of the third shortcut." translateable="false">
-        Shortcut 3
-      </message>
-      <message name="IDS_SHORTCUT_3_SHORT_NAME" desc="The short name of the third shortcut." translateable="false">
-        Shortcut 3
-      </message>
-      <message name="IDS_SHORTCUT_4_NAME" desc="The name of the fourth shortcut." translateable="false">
-        Shortcut 4
-      </message>
-      <message name="IDS_SHORTCUT_4_SHORT_NAME" desc="The short name of the fourth shortcut." translateable="false">
-        Shortcut 4
-      </message>
     </messages>
   </release>
 </grit>