Integrate changes cherry-picked for ticket #11986 into android_icu4j.
am: 96a989def4

* commit '96a989def40de002d53d58a6bc121e0c110bd6c0':
  Integrate changes cherry-picked for ticket #11986 into android_icu4j.