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

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

Change-Id: I53ccca4501c95f942c71959bbf22c55dcb59c2bd