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

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

Change-Id: Ie05de12b6a74e7cb7f0582791d264ae2557031dd