Merge changes from topic "icu71" am: cbe922a7 am: e73a4dc9 am: f4a0c5d4

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



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