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

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

Change-Id: Iad2b802f1b931bac8719fb73a2106d8939951be5