Merge "Use public API to get ICU version, not internal" am: d4d7b6cebc
am: 2b505e54b9

Change-Id: I310505ded16e5b6342cc63023cc4127b78ca407a