[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: d9c9ceecc3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0d033f37eff5f00df3607ba3b94f239a4d6988f2