Merge changes from topic "icu25q2_patches2" into main am: f3b2a8d8b1 Original change: https://android-review.googlesource.com/c/platform/external/icu/+/3548243 Change-Id: I72a2a0cf6b8d28920a45bf89fae3b0209a08ab43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>