Merge changes from topic "icu68" am: e17a139088 am: 714b3ec814 am: e10a7b9910

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95bcc68ca268b23524cf327fb2efa6f54df232df