Merge "Revert an unnecessary patch in java.text.CollationElementIterator" into sc-dev am: 03b394136e

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/15162017

Change-Id: I21c2642914663557082f5289f63c31100aa9b290