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

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

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