Merge changes from topic "icu70" am: da0880a0fe

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

Change-Id: Ibbdc18a918397f831eac512394bd31e9f1038c18