Merge "Implement storage files in Java" into main am: 33118a7e am: 0a1b4dfd

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



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