Merge "Revert "[Mainline] Migrate android.utils package items"" am: 57a531fdd6 am: e1eb136984 am: d4fff61f22

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I095637d096ed0a38c9d7baa2148bd7e514a46a9a