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

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

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