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

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

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