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

Merge "Revert^2 "Cache Java codegen'd flags in static member variables."" into main am: ca355c09 am: c0e30a22 am: 8524c8fe

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



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