Merge "Increase backup and restore time" into android13-tests-dev