Merge "Make java_sdk_library dependencies explicit" into main am: 17c7379bff

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

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