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

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

Change-Id: Ib567535f585adbe43fdaf288b62a0894da7f585d