Forward port !358
See https://gitlab.com/ubports/development/core/packaging/waydroid/-/issues/7See ubports/development/core/packaging/waydroid#7 (closed)