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

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

Change-Id: I9886a232f00ddbe81e8cae3c92a230f28b62103e