[automerger skipped] Merge "Clean up obsolete aliases for Truth." into main am: 7039b4f758 am: b83975af73 am: a6d966c08f am: 0ff843b283 -s ours

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

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

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