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: I2021977c62a737faacace67dd6972a7577a3576d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>