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: cc8f4dec am: e08da087

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



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