[automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3 am: 495b3c2a62 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I118f1fed9f369fd4fb8236b9b1a1a6fdb60ff619