Merge "Read from new storage in Java codegen" into main am: 70270692

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



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