[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: eac11b669d -s ours

am skip reason: Merged-In Ia3f31c621d052d2304c2840b6f4d29eb655317cd with SHA-1 657d475163 is already in history

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

Change-Id: Ie7152d787bdcb543cb0db4fe2c1331fad637a290