Merge "Fix error handling in aconfigd-system" into main