Merge "Revert "Add ScreenRecord to methods affected by a flaky problem"" into sc-v2-dev am: a6c4b66b7f am: a8a8c75bd7

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

Change-Id: Ib98ceb1fb8faf7966ac7f2030a02b9674103aa18