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

Change-Id: Ib75f32b469648fe519b9b3b24329d8eddd48e272