Merge "Clean up obsolete aliases for Truth." into main am: 22d08770af am: 0cf04025c8 am: 18c65ba7ca am: 1bfde15361

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

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