Merge "Add the name of the sdk library to dynamically generated java modules"...

Merge "Add the name of the sdk library to dynamically generated java modules" into main am: eb852927 am: bfdc9a89

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



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