Merge "Revert "Revert "2/ Resolve gesture one handed conflicts swipe up..."" into sc-dev am: 0bcfe825fc

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

Change-Id: I90448f1e5ea2e6d1167fabb8f3c151e79c69fda6