Merge "Code cleanup from rebase" into sc-v2-dev am: 4a5d3f39fa

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

Change-Id: Iec4c2dc7c0cf8ff6233eb9684baf508558d61c99