Merge "Allow the skeleton of "jmma" in DateFormat.getBestDateTimePattern()" am: be4e63522f am: aef91d9f66

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

Change-Id: Ib55f6656e747e1ffadb9b8103f99dc84be1deabc