Merge "Revert "Cache Java codegen'd flags in static member variables."" into...

Merge "Revert "Cache Java codegen'd flags in static member variables."" into main am: a06cff10 am: d3a323b1

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



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