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

Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2777193

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