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

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



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