[automerger skipped] Constrain scroll amount am: 6d7a006302 am: 3be13be63b -s ours am: adbc2c5b5e -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: Ia85e95e7c105fae059dd420ddb8b7dd064b20939