[automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3 -s ours am: f9a402c34c am: 5c63500b39 -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: I6c5d72669ede19617feff0545a0796e55a9876d2