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

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

Change-Id: If06d910148dbac499411e1cb33e41a7cd1c773a1