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

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

Change-Id: I847eca9d38a4b45926f6fb0d8a64ce8acd29f97d