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

Change-Id: I35a5dd3715d64316672b77ca79d69e2269f82cf6