Merge "Revert^2 "aconfig: cache flag value in generated java code"" into main...

Merge "Revert^2 "aconfig: cache flag value in generated java code"" into main am: 8b1d74ec am: 206d0dff am: d9a6eef7

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



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