[automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3 am: 043cf1557a -s ours am: 3a747c7878 -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: Ie413a48f9cf5ea707c211aed57b61e1c82676b19