Integrate changes cherry-picked for ticket #11986 into android_icu4j.

Change-Id: Ib637e7293dc6efa37f82c4d5610c7b4a03bf1444
8 files changed