Merge "Revert "Fixing testOverview test"" into sc-dev am: 7b054513b4

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

Change-Id: Ia8011647c5ba6425611833eecacdfbbbe16dfd03