[automerger skipped] Constrain scroll amount am: 6d7a006302 -s ours am: 3d1143f833 -s ours

am skip reason: Merged-In Ibf16fb72cf95e29ed820d5f511e764a388c93bb0 with SHA-1 b259a896f5 is already in history

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

Change-Id: I486ac39254258fd4fb4fa85f15cf821b24829f66