Merge "Make java_sdk_library dependencies explicit" into main am: 3e38c3fb50

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

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