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

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

Change-Id: Id7a862358eee66fc8d47ba5a469d731f443a883c