Merge "Add app compat config from ICU4J" am: 6d5fbc8434 am: cf0dc89869

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306

Change-Id: Ifd0f4808d1467b3cf54b21982afc521769536a33