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

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

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