Merge "Align CLC add context behavior between java_sdk_library and its impl...

Merge "Align CLC add context behavior between java_sdk_library and its impl lib" into main am: feeb6d1e

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



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