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

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

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