Merge "Deprecate the use of ICU.addLikelySubtags"
am: 986c242b7a

Change-Id: I86af54c4b0ca2d311a3ef1290972b47b5ddb0f8b