Merge "Make java_sdk_library dependencies explicit" into main am: 6eaf5969 am: f0d54067

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/3250181



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