667-Fix_update_with_upstream_merge_conflict

Description

This MR fixes the merge conflict which is introduced when updating to upstream v6.303

Issue(s)

• https://gitlab.e.foundation/e/os/backlog/-/issues/667

Test environment

Download apk from pipeline & check basic functionality

Test procedures

Check basic functionality is working as expected

Technical details

Screenshots

Checklist

• Self review
• Test procedure explained
• Tested on a fresh install
• Tested applied as an update
• License
• Internal documentation
• User documentation