Merge "Fix a potential concurrency issue for loading CDB file Bug: 158919530" into ub-launcher3-rvc-dev am: bb8257344c

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

Change-Id: Ie33b49a54842f2edc05176ff47a4360c85ae7bf0