Merge changes I0dc477ab,I5977d927

* changes:
  Integrate change cherry-picked for ticket #13332 into android_icu4j.
  Cherry-pick: ticket:13332: CaseMapImpl.isFollowedByCasedLetter() must increment the string index while looping