Merge "Removing some instrumentation for a workarounded bug" into sc-v2-dev am: 87cf3efe06

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

Change-Id: I0172730d135c4584db080447892a498cbca4e876