Merge "Make java_sdk_library dependencies explicit" into main am: 75e0693838 am: 8666b9c45b

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

Change-Id: Ica2ef27d29911ef8112c363ad252d70cd644c3b1
Signed-off-by: Automerger Merge Worker <[email protected]>