am afc43ed9: Merge "Full backup now saves getExternalFilesDir() content with the app data"

* commit 'afc43ed9a765766fc35477f42cbc6bfdad0b1067':
  Full backup now saves getExternalFilesDir() content with the app data