Merge "Replace utility classes" into main am: 9b60e84b36

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

Change-Id: Ib2bcd8bf53e4665bdf27e6df394fd466d31384a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>