Merge "Clean up test logging and ScreenRecord" into sc-v2-dev am: 662af98956 am: 3c7c23aa02

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

Change-Id: I98e7524b37523af64d992768ee073293e748eb71