Merge "[Autofill] Migrate aconfig flag" into main