Merge "Make java_sdk_library dependencies explicit" into main am: dd578b82

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3247681



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