[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-android_util-a0ae5zk4cb" into sc-dev am: a7f6e5ea -s ours

am skip reason: Change-Id I9b63146ae563ed977f3112c9910f7a7c575de0b8 with SHA-1 63be5144 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c2be46c55908e958dd35075baf1800b72dad188