Merge "Remove libandroidicu usage" am: cc3049a2c2 am: 8d159732f7

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

Change-Id: Ib5645de85dc5fd75b4e2f551e33aab604fb60fd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>