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: I5b7320248c68528d9e6810626e7d019e8fa91141