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

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



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