Merge "Make java_sdk_library dependencies explicit" into main am: b4276d1983 am: 10533ef2ba

Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/3250838

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