Integrate change cherry-picked for ticket #12410 into android_icu4j.
am: 3ad5c9d5a5

Change-Id: Ic65afe7f1ff440ff1f832a89c0d362eee48df3fe