Merge "java reader reads directly from map" into main am: 9f254c6b

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



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