[automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3 -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: Ic7c05b2a262e07b8364e0d1ef87a23647d4c7a60