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

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

Change-Id: I91abf415fab433aee6dfd94b8289f5ef459a8488