Merge "Fix ravenizer when transitive classpath is enabled" into main am: 2618069b am: 41f189fc

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



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