Merge "Revert "2/ Resolve gesture one handed conflicts swipe up recents"" into sc-dev am: 3b1df8d735 am: cf3a1dfe08

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

Change-Id: I408176bd5dc09b6e50659438905251d5080032fa