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

[automerger skipped] Merge "pass read new storage parameter to java codegen" into main am: 168b3f85 am: 05de3945 -s ours

am skip reason: Merged-In Id12816206a16b17c23e3a53832d268f1600107b3 with SHA-1 9612480e is already in history

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



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