Merge "Fix some issues with TwoButtonNavbarTouchController" into sc-dev am: ce7961a493

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1298cda523359b9ea32ea4a0c284aa5a3aa4ecd