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

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



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