Integrate change cherry-picked for ticket #12986 into android_icu4j.
am: a6da7bf0be

Change-Id: I82eb858dfe6c402600ee8ec00ea78adcd5d980b2