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

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

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