Merge "Make java_sdk_library dependencies explicit" into main am: 75e06938

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



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