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