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: c0f5f0c6

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



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