Merge changes from topic "icu68" am: e17a139088

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05eb8faef4d6fcf7283b01614c97f9ef2e74d0ea