DO NOT MERGE Cherry-pick: ticket:13766: Make UnicodeMapTest#TestUnicodeMapGeneralCategory smaller.

It has been fixed in aosp/master. Now cherry-pick the combined change
into Android Pie CTS.

Upstream CL: http://bugs.icu-project.org/trac/changeset/41547

This change contains several changes
1. Revert Android patch http://r.android.com/681841
2. Cherry-pick http://r.android.com/713941
3. Generate codes in android_icu4j

Bug: 111640705
Bug: 111567941
Test: Verifed the test pass on the target device. cts-tradefed run cts -m CtsIcuTestCases
Change-Id: Ib88bc1804334c359bc39affcb9940477ffda29c8
2 files changed