GitLab

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}