Merge "Partially restoring reverted logging" into sc-v2-dev am: 0cc439ab18

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

Change-Id: Ie4d9490ff68cdc4427f31696b188ba139bf57542