Merge "Folder updates." into sc-dev am: 83c4b1fd72

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

Change-Id: Ia8cb2538cf57c2fdf1a14aa5a906ea7753e87f75