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

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

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