Merge "Removing Launcher dependency from Folders" into sc-dev am: b32fd46c8d am: 44fcf30a1b

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

Change-Id: I7c9fa50df1e41d128533ed6dedb1e05d78b92848