Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" am: ffcc7427a8 am: 6cb4bb76d6

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

Change-Id: If52898da0b66bf70ed7533bc991251a1f927f19c