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

[automerger skipped] Merge "Clean up obsolete aliases for Truth." into main am: 7039b4f7 am: b83975af am: a6d966c0 am: 0ff843b2 -s ours am: 681ac82f -s ours

am skip reason: Merged-In I7e29732e1e77e37cfb491521d14d2f3eb07deb36 with SHA-1 ce1b2a1c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2776855



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