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: I5de029df53dfe270db7c75a4c651a819b303965a