Merge "Merge remote-tracking branch 'aosp/icu62' into aosp/master."