[automerger skipped] Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f am: 409a6b2492 am: 23c571ff2b -s ours am: 8f4a7e7505 -s ours

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

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

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