Merge "Make java_sdk_library dependencies explicit" into main am: 3f3e76e018 am: 6df16f7034

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

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