Merge "Make java_sdk_library dependencies explicit" into main am: 0864b55d

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



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