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 am: 6aa5f568

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



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