Merge "Change openjdk9 specific props in bp2build/Soong" into main am:...

Merge "Change openjdk9 specific props in bp2build/Soong" into main am: c723757d am: b29d829e am: 91d416a7 am: 61d7def3 am: 57b0309d

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



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