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

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

Change-Id: I6459733abb399137224fe9c24ac7cdc63282dd9e