Merge "Update flags.aconfig to follow the current APIs" into main