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

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

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