Merge "Revert "vendor: remove our old gapps backup script"" into android-10