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

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

Change-Id: I23da6d589855779aef46a6c7b572f4bd7eacb705