Merge "Removing Launcher dependency from Folders" into sc-dev am: b32fd46c8d am: 7f9674dac2

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

Change-Id: I356abb595974aae207a771dc2d537ffdcaaa942d