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

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



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