Merge "Partial cleanup after b/143488140" into sc-dev am: 6f0dc99961

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

Change-Id: Ibf1f93faadffa3d1dc8d9c45b0ef4ebb6e988f10