Merge "Clean up obsolete aliases for Truth." into main am: 005529a3 am:...

Merge "Clean up obsolete aliases for Truth." into main am: 005529a3 am: 287f96cb am: d472ca5b am: 73e9eace

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2778089



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