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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie97caf105d4a1c2ea8da991376f10545daab34d1