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

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



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