Merge "Revert "Removing some unused code from All-Apps"" into tm-dev am: b1f6a3fe am: fdda2295

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17917348



Change-Id: I298e1d6103c1445e1778e51a82045572309fc422
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>