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

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



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