Merge "Clean up obsolete aliases for Truth." into main am: 7039b4f758 am: b83975af73

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

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