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

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

Change-Id: Ie7aaa680ad81f065d9d3d2d38928092e9ee3aa38