Merge "Allow host self-references in external/icu/..." am: b9ed4c85c8

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

Change-Id: I599ba96e3bc1812a175cdf4a184aa7b5dd58e3d9