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

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

Change-Id: I4bcde01e4feba458ca4597409fddcd2c76980b46