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

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

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



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