Merge "add storage java internal reader" into main am: 657d68ae am: f9c1b731

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



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