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: I2cddc4763bdd24781417f81d4fb22d4c722e66ab