Merge changes from topic "soong-java-install" am: 585ec03c47

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

Change-Id: If2f69fcbaff7dcf4e50de6bae059a091ec18ca4d