[automerger skipped] Merge "Deprecate the use of ICU.addLikelySubtags" am: 986c242b7a am: c27cc4041b
am: 35f3e83e87 -s ours
am skip reason: change_id I25ad003c70b5028942d50d8e83d1cc62ee74d31b with SHA1 57e23f19e6 is in history

Change-Id: Id8f14a16f58121977be93be5650e33a35e1ce1df