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

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

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