[automerger skipped] Merge "Make java_sdk_library dependencies explicit" into main am: 0864b55d88 am: d3781ae699 -s ours

am skip reason: Merged-In I80af0b9efa88c668306f0ff1d51491a8180dc57f with SHA-1 e07d73c374 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3247499

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