[automerger skipped] Merge "Revert "pass read new storage parameter to java...

[automerger skipped] Merge "Revert "pass read new storage parameter to java codegen"" into main am: 5c128346 am: c561d6d1 -s ours

am skip reason: Merged-In Id12816206a16b17c23e3a53832d268f1600107b3 with SHA-1 9612480e is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/build/soong/+/3276672

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



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