Merge "Clean up obsolete aliases for Truth." into main am: 7039b4f7 am: b83975af am: a6d966c0

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



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