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

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

Change-Id: Ia20f6f9fcc64711e79a9afdd38895ab600b8c691