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

Change-Id: I113637c02e7128d186d6329d55983eedac47e5c8