Merge "Make java_sdk_library dependencies explicit" into main am: aaa15def88 am: 0df42533a1

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

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