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

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

Change-Id: Ibf7d65359e2cc129fbf8e1366dfa80f23ae80c04