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

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

Change-Id: I1796132273d090fac0a18e49e4bf45412d1c595a