Merge "Remove unnecessary abstraction of classes." into main am: 35434353

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



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