[automerger skipped] DO NOT MERGE Temporary fix for race condition. am: 928e0521b2 am: d25afb7eab -s ours

am skip reason: subject contains skip directive

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

Change-Id: If90d4051041f6596ee05f54bde166a3e11b8132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>