Merge "a.t.f.DateFormat behaves consistently with j.t.DateFormat in en, en-US locale" am: db93b81c am: 17859107 am: 7e767cc9 am: d3bffa0c am: 243175f3

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



Change-Id: Id45de8b9314779937774154356440f2baa269af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>