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

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

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