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

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

Change-Id: If259b13ab777993002a471c541e80bd77e31e905