527 update with upstream v6.101

Description

update with upstream v6.101. https://github.com/thundernest/k-9/releases/tag/6.101. This MR resolves the merge conflicts introduced in the automated updated pipeline job.

Issue(s)

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

Test environment

Download apk from pipeline

Test procedures

Check basic functionality works or not.

Technical details

Screenshots

Check list

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