Merge "Remove libcore.icu.ICU usage in android.text.format.DateFormat" am: ec71624f22

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355737

Change-Id: If98b1ad06b4dd369cf271236ac16d3501c8a9d40