Merge "Update @IntraCoreApi and @CorePlatformApi in the ICU4J srcgen tool"