Merge "2/ Resolve gesture one handed conflicts swipe up recents" into sc-dev am: 54d69965bf am: c1fd2ab7c5

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

Change-Id: I135a666745b5c49b0cfa6cd50a213a3b8e973aa5