Merge "aconfig: fix broken test 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue'" into main