Merge "aconfig: fix broken test...

Merge "aconfig: fix broken test 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue'" into main am: d2a333f6 am: 773c57f5 am: ada37d19

Original change: https://android-review.googlesource.com/c/platform/build/+/2868579



Change-Id: Ia2619ced848ba97f23ad529550eb1bf9262194d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>