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

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

Change-Id: If25dbbfe1229540783ef960f17df446c8bbc4853