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

am skip reason: subject contains skip directive

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

Change-Id: I28e6bf79acfe4076c0e8572d097d9b0bf4a60456