Merge pull request #10424 from JosJuice/android-export-empty-folders Android: Include empty folders when exporting user data