Merge "Clean up ScreenRecord for AddWidgetTest" into sc-v2-dev am: fcc4dbb65b am: f621dc1dcc

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

Change-Id: I0e62f7a94b31aa4684723ae28912ac544e542524