Merge "Avoid filegroup dependency from ICU to libcore." am: c67fcdd8c9

Original change: https://android-review.googlesource.com/c/platform/external/icu/+/1495078

Change-Id: I787f1b3ec1b1b38820aaa48626147bc14cc4dbd0