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: I0bd4d740fba671dcfb0536771983755be654c53f