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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2776858

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