Merge "Snapshot logging only use cloned model thread folder contents Bug: 158826147" into ub-launcher3-rvc-dev am: 9c126682d7

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

Change-Id: I7e35babd5a8d86e9faca238143b9ebf61101c36b