Merge "(1/n) Disabling OHM gesture in NavigationBar 3 Button mode" into sc-dev am: e8b62e4d am: 959b5210

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

Change-Id: Ifdb8b90839bec485271b429204d5d8256b239cae