Merge "Fixes missing folder label after launcher restarts. am: e1486520 am:...

Merge "Fixes missing folder label after launcher restarts. am: e1486520 am: d1137b8c" into rvc-d1-dev-plus-aosp am: c30c80af

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

Change-Id: I9c76713f7da8964fd5f36367d1248d8607f6e3dd