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

Change-Id: Iaba13fb5c4ed8099d5b877c397f8bce4c4e36284