Merge "Add FolderInfo label source / Add instance id to snapshot logging" into ub-launcher3-rvc-dev am: 3b1786ce77

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

Change-Id: Ibb42efc4a1454dde6155d0f1422c2565ed4ce3c3