Merge "Clean up obsolete aliases for Truth." into main am: 39e64e58c6 am: da76b265cc

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2778075

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