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

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



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