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

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

Change-Id: I44f974bceabcee75250ccd491153ef3ac14f5762