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

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

Change-Id: I991d6f6e98ac390ace6598d550ae3af46bbf2d7d