Merge "Implement screenshot tests for Folders on the workspace" into...

Merge "Implement screenshot tests for Folders on the workspace" into udc-qpr-dev am: 715c2ae0 am: bfaa1a5a

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



Change-Id: I1c4c8f089684af779a4c32f76c0e7a0cb0fd018e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>