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

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

Change-Id: I5f41ce39eec283c3043735e6068aea15ac98c715