[automerger skipped] Merge "aconfig: prototype AconfigFlagAccessor" into main am: 93937ac342 am: 068a299844 -s ours

am skip reason: Merged-In I62ea458c05fb61973705346c4313535f9b2291be with SHA-1 c65c7c7f57 is already in history

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

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