Merge "Avoid unnecessary ULocale.addLikelySubtags()" into oc-dev am: 5163d541a2
am: c43b9f27f2

Change-Id: Id5ff1326f1800219a2deeaef97b7d2b400ceefc6