Merge "Cherry-pick: Replace @Deprecated ICU API - USCRIPT_CODE_LIMIT"
am: 04e2a2995e

Change-Id: Ib0af35be24fcc66ca4d3d841f02cd71fc2811273