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

[automerger skipped] Merge "Clean up obsolete aliases for Truth." into udc-qpr-dev-plus-aosp am: e82d01b8 -s ours

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

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



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