Merge "Add build flag for disabling system aconfigd socket" into main