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

Change-Id: I976fea1146283927b789e372425ff91942f48754