DO NOT MERGE: Backport 2017c icu test changes

Incorporates the 2017c test changes from upstream:
http://bugs.icu-project.org/trac/changeset/40634

These changes should make CTS pass with both 2017b
(the stock release version) and 2017c.

Bug: 68878031
Bug: 68183339
Test: build only
Change-Id: Icf230d3a176d7a31dbde92b67cbb18baeedbff20
3 files changed