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 am: 93c8a8af

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

Change-Id: Ib04b105dc4c83057d474de6142378e4562cab0e9