Merge "Fix unable to swipe up to exit one-handed mode under 2 button navigation" into sc-dev am: 1b3f5d3883 am: 0476be4a35

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

Change-Id: Ideff92e3380a41b21aa307b3ab8ce4d28a3221c8