Merge "Fix issue with touches falling through nav bar in 3 button nav" into tm-qpr-dev am: 354ad8b465 am: cb022b8ec3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20066574

Change-Id: Ib23e7515b1b7b2ec7e7189fa9d02c4b103db614b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

@@ -541,10 +541,12 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
                 if (!mImeVisible) {
                     // IME not showing, take all touches
                     info.setTouchableInsets(InternalInsetsInfo.TOUCHABLE_INSETS_FRAME);
+                    return;
                 }
                 if (!mView.isImeRenderingNavButtons()) {
                     // IME showing but not drawing any buttons, take all touches
                     info.setTouchableInsets(InternalInsetsInfo.TOUCHABLE_INSETS_FRAME);
+                    return;
                 }
             }