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

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

Change-Id: I59adb5f869d491dbb7720bd79f616a4cc94e1452