Merge "[automerger skipped] java_sdk_library: Control shared library use am:...

Merge "[automerger skipped] java_sdk_library: Control shared library use am: e6428b48 -s ours am: e1fdfe58 -s ours" into rvc-d1-dev-plus-aosp am: c4d30fd8 -s ours

am skip reason: Change-Id Iccf509e808d5ff53522188541a4c54d8f9ada93c with SHA-1 e6428b48 is in history

Change-Id: I67311aac3d3bb8b7be34059323848b562da46a8d