Merge changes from topic "icu25q2_patches2" into main am: f3b2a8d8b1 am: 50f255c8b0

Original change: https://android-review.googlesource.com/c/platform/external/icu/+/3548243

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