Merge changes from topic "icu70" am: da0880a0fe am: 4bd88f5cd6 am: fd779286da

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

Change-Id: Ic1df8684bec29041368790400232c42599b11188