Merge "Reland "Make override immediately override aconfigd"" into main