[automerger skipped] Merge SP2A.220305.012 am: 11a0454879 -s ours

am skip reason: Merged-In I51cb81718a489ad7568c5e05ace0b3dbc6ca5443 with SHA-1 0077caa15d is already in history

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

Change-Id: Ife61a6188c19b497fda7df645caa549e4d90835a