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

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

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