[automerger skipped] Merge "Clean up obsolete aliases for Truth." into main...

[automerger skipped] Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f9 am: b06310a6 am: 409a6b24 am: 23c571ff -s ours

am skip reason: Merged-In I8aab463c74d5e869d949a2b712886a9cc4d15709 with SHA-1 15e17e01 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829



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