Merge "Fix unable to swipe up to exit one-handed mode under 2 button...

Merge "Fix unable to swipe up to exit one-handed mode under 2 button navigation" into sc-dev am: 1b3f5d38 am: 12a0357c am: 9008a57a

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

Change-Id: I99f77b25e2a4b7f6b4d0e24116b69f713078244d