Merge "Removing old workaround" into sc-v2-dev am: 77c08b045e

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

Change-Id: I90431ad3e1773c909d94fc7b0aeacf77c439af24